页面完善

2023-11-08 17:31:37 +08:00
parent b08bc52662
commit 346ec9d615
5 changed files with 218 additions and 151 deletions
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
            "src" : "图片路径"
        }
    ],
-    "versionName" : "1.2.12",
-    "versionCode" : 1212,
+    "versionName" : "1.2.13",
+    "versionCode" : 1213,
    "app-plus" : {
        "compatible" : {
            "ignoreVersion" : true
--- a/pages/acupoint/acupointDetail.vue
+++ b/pages/acupoint/acupointDetail.vue
@@ -8,7 +8,7 @@
 				:duration="duration">
 				<swiper-item v-for="(item, index) in acupointDetail.imageList" :key="index">
 					<view class="swiper-item">
-						<image :src="item" mode="aspectFit"></image>
+						<image :src="item" mode="aspectFit" @click="previewImage(item)"></image>
 					</view>
 				</swiper-item>
 			</swiper>
@@ -21,7 +21,7 @@
 					</view>
 				</uni-section>
 				<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}}
 					</view>
 					<view class="item" v-else>
@@ -30,20 +30,20 @@
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="所属经络" type="line">
-					<view class="item">
-						{{acupointDetail.meridian}}
+					<view class="item" v-html="acupointDetail.meridian">
+						
 					</view>
 				</uni-section>
 				
-				<uni-section class="mb-10" titleFontSize="18px" title="定位" type="line">
-					<view class="item">
-						{{acupointDetail.position}}
+				<uni-section class="mb-10" titleFontSize="18px" title="定位" type="line" >
+					<view class="item" v-html="acupointDetail.position">
+						
 					</view>
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="解剖" type="line">
-					<view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''">
-						{{acupointDetail.anatomy}}
+					<view class="item" v-if="acupointDetail.anatomy && acupointDetail.anatomy != ''" v-html="acupointDetail.anatomy">
+						
 					</view>
 					<view class="item" v-else>
 						暂无
@@ -51,14 +51,13 @@
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="主治" type="line">
-					<view class="item">
-						{{acupointDetail.indication}}
+					<view class="item" v-html="acupointDetail.indication">
+						
 					</view>
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="配伍" type="line">
-					<view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''">
-						{{acupointDetail.compatibility}}
+					<view class="item" v-if="acupointDetail.compatibility && acupointDetail.compatibility != ''" v-html="acupointDetail.compatibility">
 					</view>
 					<view class="item" v-else>
 						暂无
@@ -66,8 +65,8 @@
 				</uni-section>
 				
 				<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
-					<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''">
-						{{acupointDetail.literature}}
+					<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''" v-html="acupointDetail.literature">
+						
 					</view>
 					<view class="item" v-else>
 						暂无
@@ -105,6 +104,19 @@
 			this.getDetail()
 		},
 		methods: {
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
 			// 穴位详情
 			getDetail() {
 				$http.request({
@@ -139,7 +151,7 @@
 	.mb-10{ margin-bottom: 10px;}
 	.content{font-size: 28rpx;}
 	.swiper-item{
-		image{margin: 0 auto; height:200rpx;}
+		image{margin: 0 auto; height:250rpx;}
 		
 	}
 	.uni-margin-wrap{ margin-bottom: 20rpx; padding-top: 20rpx;
--- a/pages/clock/clock.vue
+++ b/pages/clock/clock.vue
@@ -661,7 +661,7 @@
 					.then(res => {
 						if (res.code == 0) {
 							console.log(res, '任务信息')
-							if (res.result != {}) {
+							if (res.result != {} && res.result) {
 								this.taskInfo = res.result
 								this.taskInfo.video != '' ? this.poster = this.taskInfo.video +
 									"?x-oss-process=video/snapshot,t_0,f_jpg" : ''
@@ -735,7 +735,7 @@
 					return
 				}

-				if (!this.taskInfo.id) {
+				if (this.taskInfo != null && !this.taskInfo.id) {
 					uni.showToast({
 						title: '当天未发布打卡任务,不可签到哦',
 						icon: 'none'
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -18,14 +18,15 @@
 						<image src="../../static/icon/five2.png" mode="aspectFit"></image>
 						<text>方药检索</text>
 					</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">
 						<image src="../../static/icon/five4.png" mode="aspectFit"></image>
 						<text>五运六气</text>
 					</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">
 						<image src="../../static/icon/five5.png" mode="aspectFit"></image>
 						<text>吴门医述</text>
--- a/pages/user/addAddress.vue
+++ b/pages/user/addAddress.vue
@@ -19,9 +19,9 @@

 				<u-form-item label="所在地区 :" prop="">
 					<view class="add_arrow" @click="addreShow=true">{{addressForm.areaidpathtext}}</view>
-					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName"
-						@confirm="addconfirm" @change="changeHandler" ></u-picker>
-				</u-form-item>				
+					<u-picker @cancel="addcancel" :show="addreShow" ref="uPicker" :columns="columns" keyName="UName" -->
+					 @confirm="addconfirm" @change="changeHandler" ></u-picker>				
+				</u-form-item>
 				<u-form-item label="详细地址 :" prop="useraddress">
 					<u-input type="string" v-model="addressForm.useraddress" placeholder="小区楼栋/乡村名称" clearable
 						border="surround" />
@@ -50,7 +50,6 @@
 </template>

 <script>
-	
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
 	import addressList1 from "@/static/json/address.json"
@@ -64,14 +63,14 @@
 				// indexp:0,
 				// indexq:0,
 				// indexc:0,
-				playData:{},
+				playData: {},
 				addreShow: false, //是否显示
 				columns: [], //省份数据显示，三级联动需要三维数组，展示初始数据
 				columnData: [], //市数据
 				columnDatas: [], //区地址
 				switchTrue: true,
 				switchFalse: false,
-				addressChanged:false, // 地址修改标记
+				addressChanged: false, // 地址修改标记
 				navName: '', // 顶部导航栏标题
 				provId: '', // 存储省id
 				cityId: '', // 存储市id
@@ -91,6 +90,51 @@
 				isShowDel: false,
 				editIndex: 0,
 				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: {
 					username: [{
 						required: true,
@@ -137,10 +181,10 @@
 				this.getAddress()
 			}
 			this.initDataPicker() //初始化省份列表
-			
+
 		},
 		onShow() {
-		
+
 		},
 		computed: {
 			...mapState(['userInfo']),
@@ -148,113 +192,113 @@
 		onReady() {
 			this.$refs.addForm.setRules(this.rules)
 		},
-		components:{
-			musicPlay	
+		components: {
+			musicPlay
 		},
-		methods: {						
+		methods: {
 			// 三级联动
 			initDataPicker() {
 				// console.log(this.addressList,'addressList')				
 				// this.$http
-					// .post('api/province/getProvince')
-					// .then(res => {
-					// 	if (res.code == 0) {
-							// this.addressList = res.provinceEntity
-							//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
-							let province = []; //初始数据需要展示的省份
-							let province1 = [{
-								"cityId": this.addressList[0].cityList[0].cityId,
-								"provId": this.addressList[0].cityList[0].provId,
-								"cityName": this.addressList[0].cityList[0].cityName,
-								"UName": this.addressList[0].cityList[0].cityName,
-								"createDate": this.addressList[0].cityList[0].createDate,
-								"regionCode": this.addressList[0].cityList[0].regionCode,
-								"countyList": this.addressList[0].cityList[0].countyList
-							}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
-							let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区
+				// .post('api/province/getProvince')
+				// .then(res => {
+				// 	if (res.code == 0) {
+				// this.addressList = res.provinceEntity
+				//此处的province主要用作数据的初始化，即刚打开就需要进行展示的数据，这个跟第一条省份数据相关，我的第一条是北京市，所以需要columns中的三维数组，第一维度是省份数据数组，第二维度是市数据数组，第三维度是区数据数组
+				let province = []; //初始数据需要展示的省份
+				let province1 = [{
+					"cityId": this.addressList[0].cityList[0].cityId,
+					"provId": this.addressList[0].cityList[0].provId,
+					"cityName": this.addressList[0].cityList[0].cityName,
+					"UName": this.addressList[0].cityList[0].cityName,
+					"createDate": this.addressList[0].cityList[0].createDate,
+					"regionCode": this.addressList[0].cityList[0].regionCode,
+					"countyList": this.addressList[0].cityList[0].countyList
+				}]; //因为第一个市北京市，所以就直接添加北京市下辖的直辖市了 也即初始数据需要展示的市，北京市只有一个市辖区
+				let province2 = []; //初始数据需要展示的区域数据，也即是 北京市市辖区内的区


-							for (let i = 0; i < this.addressList.length; i++) {
-								this.addressList[i].UName = this.addressList[i].provName
-								if (this.addressList[i].cityList == null) {
-									this.addressList[i].cityList = [{
-										"cityId": this.addressList[i].provId,
-										"provId": this.addressList[i].provId,
-										"cityName": this.addressList[i].provName,
-										"UName": this.addressList[i].provName,
-										"createDate": this.addressList[i].createDate,
-										"regionCode": this.addressList[i].regionCode,
-										"countyList": [{
-											"countyId": this.addressList[i].provId,
-											"cityId": this.addressList[i].provId,
-											"countyName": this.addressList[i].provName,
-											"UName": this.addressList[i].provName,
-											"createDate": this.addressList[i].createDate,
-											"regionCode": this.addressList[i].regionCode
-										}]
-									}]
-								} else {
-									for (let j = 0; j < this.addressList[i].cityList.length; j++) {
-										this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
-											.cityName
-										for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
-											this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
-												.cityList[j].countyList[k].countyName
-										}
-									}
-								}
-								province.push(this.addressList[i]);
+				for (let i = 0; i < this.addressList.length; i++) {
+					this.addressList[i].UName = this.addressList[i].provName
+					if (this.addressList[i].cityList == null) {
+						this.addressList[i].cityList = [{
+							"cityId": this.addressList[i].provId,
+							"provId": this.addressList[i].provId,
+							"cityName": this.addressList[i].provName,
+							"UName": this.addressList[i].provName,
+							"createDate": this.addressList[i].createDate,
+							"regionCode": this.addressList[i].regionCode,
+							"countyList": [{
+								"countyId": this.addressList[i].provId,
+								"cityId": this.addressList[i].provId,
+								"countyName": this.addressList[i].provName,
+								"UName": this.addressList[i].provName,
+								"createDate": this.addressList[i].createDate,
+								"regionCode": this.addressList[i].regionCode
+							}]
+						}]
+					} else {
+						for (let j = 0; j < this.addressList[i].cityList.length; j++) {
+							this.addressList[i].cityList[j].UName = this.addressList[i].cityList[j]
+								.cityName
+							for (let k = 0; k < this.addressList[i].cityList[j].countyList.length; k++) {
+								this.addressList[i].cityList[j].countyList[k].UName = this.addressList[i]
+									.cityList[j].countyList[k].countyName
 							}
+						}
+					}
+					province.push(this.addressList[i]);
+				}


-							this.addressList[0].cityList[0].countyList.map(item => {
-								province2.push(item);
-							});
+				this.addressList[0].cityList[0].countyList.map(item => {
+					province2.push(item);
+				});

-							//省数据 因为要做数据初始化，所以是三维数组 
-							// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
-							this.columns.push(province);
-							this.columns.push(province1);
-							this.columns.push(province2);
+				//省数据 因为要做数据初始化，所以是三维数组 
+				// 数据格式 [ [所有的省份数据:{},{}] , [第一个省份下的所有的市:{},{},{}] , [第一个市下面所有的区:{},{},{}] ]
+				this.columns.push(province);
+				this.columns.push(province1);
+				this.columns.push(province2);

-							// console.log(6666666,this.columns)
+				// console.log(6666666,this.columns)

-							// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
-							// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据
+				// 市数据数组，筛选address.json文件，将全国所有省下面的市数据放入数组
+				// 格式[ [第一个省下面所有市,{},{},{}] , [第二个省下面所有市{},{},{}] , [第三个省下面所有市{},{},{}] ] 注意，以上的第一第二对应着 columns[0] 的数据

-							this.addressList.map(item => {
-								let city = [];
-								item.cityList.map(item1 => {
-									city.push(item1);
-								});
-								this.columnData.push(city);
-							});
+				this.addressList.map(item => {
+					let city = [];
+					item.cityList.map(item1 => {
+						city.push(item1);
+					});
+					this.columnData.push(city);
+				});

-							//区数据数组
-							//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,]   ,   [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,]   ]
+				//区数据数组
+				//数据格式: [ 所有省下面所有市的所有区 [ 第一个省下面所有市的区:[ [第一个省下面第一个市的所有区] , [第一个省下面第二个市的所有区] ,]   ,   [ 第二个省下面所有市的区:[ [第二个省下面第一个市的所有区] , [第二个省下面第二个市的所有区] ,]   ]

-							let area = [];
-							this.addressList.map((item, index) => {
-								let area1 = []; //省下面所有市的初始化
-								item.cityList.map(item1 => {
-									area = []; //市下面的区初始化
-									item1.countyList.map(item2 => {
-										area.push(item2);
-									});
-									area1.push(area); // 每循环一个市，添加该市下面的所有区
-								});
-								this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
-							});
+				let area = [];
+				this.addressList.map((item, index) => {
+					let area1 = []; //省下面所有市的初始化
+					item.cityList.map(item1 => {
+						area = []; //市下面的区初始化
+						item1.countyList.map(item2 => {
+							area.push(item2);
+						});
+						area1.push(area); // 每循环一个市，添加该市下面的所有区
+					});
+					this.columnDatas.push(area1); // 每循环一个省，添加该省下面的所有市
+				});

-						// };
-					// }).catch(e => {
-					// 	console.log(e,'e')
-					// })
+				// };
+				// }).catch(e => {
+				// 	console.log(e,'e')
+				// })

 			},
 			changeHandler(e) { //城市选择时触发
-			console.log(e,'变化了',this.columnData, this.columnDatas)
-			this.addressChanged = true
+				console.log(e, '变化了', this.columnData, this.columnDatas)
+				this.addressChanged = true
 				const {
 					columnIndex, //当前选择的列，省 / 市 / 区
 					value, // 当前选择的数组内容
@@ -266,7 +310,7 @@
 				// 当第一列值发生变化时，变化第二列和第三列的值（省份变更，市和区跟着变更）
 				if (columnIndex === 0) { // 判断当前变更的是省还是市还是区
 					// picker为选择器this实例，变化第二列对应的选项				
-					
+
 					picker.setColumnValues(1, this.columnData[
 						index]); //设置市为该省下面的所有市，index是当前省在省份数组的下标，对应市数组中的下表就是 该省下面的所有市 的数据
 					picker.setColumnValues(2, this.columnDatas[index][0]); // 设置区域为该省下面第一个市下面的所有区域
@@ -278,7 +322,7 @@
 			},

 			addconfirm(e) { //点击确定按钮
-			console.log(e,'选中的值')
+				console.log(e, '选中的值')
 				this.addressChanged = true
 				this.addreShow = false;
 				this.addressForm.areaidpathtext = e.value[0].UName + '-' + e.value[1].UName + '-' + e.value[2].UName
@@ -286,7 +330,7 @@
 				this.cityId = e.value[1].cityId
 				this.countyId = e.value[2].regionCode
 			},
-			
+
 			addcancel() { //点击取消按钮
 				this.addreShow = false;
 			},
@@ -314,7 +358,7 @@
 						// this.addressForm.consigneePhone = this.addressForm.userphone
 						// this.addressForm.consigneeName = this.addressForm.username
 						// this.addressForm.regionCode = ''
-						
+
 						// // this.addressForm.userid = this.userInfo.id
 						// if(this.addressChanged){ // 如果修改过地址区域，就重新赋值，否则保持不变
 						// 	this.addressForm.areaidpath = `${this.provId}_${this.cityId}_${this.countyId}`
@@ -325,15 +369,15 @@

 						// let data = this.addressForm
 						let data = {
-							'id':this.addressForm.addressid,
-							'detailAddress' : this.addressForm.useraddress,
-							'regionCode':this.countyId,
-							'userId':this.userInfo.id,
-							'consigneePhone':this.addressForm.userphone,
+							'id': this.addressForm.addressid,
+							'detailAddress': this.addressForm.useraddress,
+							'regionCode': this.countyId,
+							'userId': this.userInfo.id,
+							'consigneePhone': this.addressForm.userphone,
 							'consigneeName': this.addressForm.username,
-							'isDefault':this.addressForm.isDafault ? 1 : 0
+							'isDefault': this.addressForm.isDafault ? 1 : 0
 						}
-						console.log(data,'保存参数')
+						console.log(data, '保存参数')
 						$http.request({
 							url: link_add,
 							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
@@ -375,16 +419,17 @@
 					.then(res => {
 						if (res.code == 0) {
 							this.addressForm = {
-								'useraddress':res.list[this.editIndex].detailAddress,
-								'userphone':res.list[this.editIndex].consigneePhone,
-								'username':res.list[this.editIndex].consigneeName,
-								'isdefault':res.list[this.editIndex].isDefault,
-								'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
-								,'addressid':res.list[this.editIndex].id
+								'useraddress': res.list[this.editIndex].detailAddress,
+								'userphone': res.list[this.editIndex].consigneePhone,
+								'username': res.list[this.editIndex].consigneeName,
+								'isdefault': res.list[this.editIndex].isDefault,
+								'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,
+								'addressid': res.list[this.editIndex].id
 							}
 							this.countyId = res.list[this.editIndex].regionCode
-						//	this.addressForm = res.list[this.editIndex]
+							//	this.addressForm = res.list[this.editIndex]
 							if (this.addressForm.isdefault == 1) {
 								this.addressForm.isDafault = true
 							}
@@ -399,15 +444,15 @@
 				this.deleteShow = false
 				this.$http
 					.get(`book/userAddress/delete?id=${this.addressForm.addressid}`)
-				.then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: '地址删除成功',
-							duration: 1000,
-						});
-						uni.navigateBack()
-					}
-				})
+					.then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: '地址删除成功',
+								duration: 1000,
+							});
+							uni.navigateBack()
+						}
+					})
 			},

 		},
@@ -416,10 +461,19 @@
 </script>

 <style lang="scss" scoped>
-	.flexbox{display: flex;}
-	.selectAdd{ justify-content: space-between;
-		.addItem{ display: block;width: 30%}
+	.flexbox {
+		display: flex;
 	}
+
+	.selectAdd {
+		justify-content: space-between;
+
+		.addItem {
+			display: block;
+			width: 30%
+		}
+	}
+
 	.add_arrow {
 		height: 28px;
 		line-height: 28px;
@@ -495,4 +549,4 @@
 			background-image: linear-gradient(90deg, #bf0c0c 0%, #95110c 100%)
 		}
 	}
-</style>
+</style>