境外短信验证登陆

config/baseUrl.js

@@ -45,9 +45,10 @@ const courtConfig = {
 	}
 };
 //手机号验证正则表达式
-// const phoneRegular = /^1\d{10}$/;
+// (中国大陆)
+const phoneRegular = /^1\d{10}$/;
 // 手机号码验证 支持港澳台 大陆
-const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$/;
+// const phoneRegular = /^[1][3-8]\d{9}$|^([6|9])\d{7}$|^[0][9]\d{8}$|^[6]([8|6])\d{5}$|^(00){0,1}(65){1}[13689]\d{6,7}$/;
 //邮箱验证正则表达式
 const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
 //密码验证正则表达式

config/requestConfig.js

@@ -167,6 +167,7 @@ $http.dataFactory = async function(res) {
 					title: '登录失效，请重新登录',
 					icon: 'none'
 				});
+				console.log('到这里了')
 				setTimeout(() => {
 					uni.navigateTo({
 						url: "/pages/user/login"

main.js

@@ -11,8 +11,8 @@ Vue.prototype.$bgm = bgm
  // Vue.prototype.$baseUrl = "http://59.110.212.44:9100/pb/"
  Vue.prototype.$baseUrl = "https://api.nuttyreading.com/" 
  // 安卓安卓包下载地址
-// Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"
+// Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"    // 本地地址
-Vue.prototype.$apkUrl = "https://www.nuttyreading.com/nuttyreading.apk"
+Vue.prototype.$apkUrl = "https://a.app.qq.com/o/simple.jsp?pkgname=com.cn.nuttyreading"    // 应用宝
 
 
 // uView组件库

manifest.json

@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.2.10",
+    "versionName" : "1.2.15",
-    "versionCode" : 1210,
+    "versionCode" : 1215,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
@@ -113,7 +113,8 @@
                     "entitlements" : {
                         "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
                     }
-                }
+                },
+                "idfa" : false
             },
             "icons" : {
                 "android" : {
@@ -153,7 +154,10 @@
         "splashscreen" : {
             "alwaysShowBeforeRender" : false
         },
-        "nativePlugins" : {}
+        "nativePlugins" : {},
+        "uniStatistics" : {
+            "enable" : true
+        }
     },
     // 5+App特有相关
     "quickapp" : {},
@@ -171,6 +175,9 @@
             "scope.userLocation" : {
                 "desc" : "你的位置信息将用于小程序位置接口的效果展示"
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
     "h5" : {
@@ -183,9 +190,61 @@
             "treeShaking" : {
                 "enable" : true
             }
+        },
+        "uniStatistics" : {
+            "enable" : true
         }
     },
-    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274"
+    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
+    "uniStatistics" : {
+        "version" : "2",
+        "enable" : true
+    },
+    "mp-alipay" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-baidu" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-jd" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-kuaishou" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-lark" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-qq" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "mp-toutiao" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-huawei" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    },
+    "quickapp-webview-union" : {
+        "uniStatistics" : {
+            "enable" : true
+        }
+    }
 }
 // 小程序特有相关
 

pages.json

@@ -492,6 +492,22 @@
         		"navigationBarTitleText" : "充值详情1",
         		"enablePullDownRefresh" : false
         	}
+        },
+        {
+        	"path" : "pages/acupoint/acupoint",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "穴位检索",
+        		"enablePullDownRefresh" : false
+        	}
+        },
+        {
+        	"path" : "pages/acupoint/acupointDetail",
+        	"style" : 
+        	{
+        		"navigationBarTitleText" : "脉穴详情",
+        		"enablePullDownRefresh" : false
+        	}
         }
     ],
 	"globalStyle": {

pages/acupoint/acupoint.vue

@@ -0,0 +1,327 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module> -->
+		<z-nav-bar title="穴位检索"></z-nav-bar>
+		<!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
+			@cancel="cancel" @clear="clear">
+		</uni-search-bar> -->
+		<view class="search_box">
+			<u-search placeholder="请输入穴位名" @focus="focus" @clear="clear" v-model="searchValue" @input="input" @blur="blur" @search="search"></u-search>
+		</view>
+		<view class="searchList" v-show="showSearchList">
+			<view class="itemBox" v-if="searchList.length > 0">
+				<view class="item" v-for="(item, index) in searchList" :key="index"  @click="gotoDetail(item)">
+					{{item.title}}
+				</view>
+			</view>
+			<view v-else class="">
+				<u-divider  text="未找到相关穴位哦~"></u-divider>
+			</view>
+		</view>
+		<view v-show="!showSearchList" class="contentBox">
+			<!-- <scroll-view class="scroll-view_H oneCateList" scroll-x="true" scroll-left="0"> -->
+			<view class="oneCateList flexbox">
+				<text :class="[curOneCateIndex == index ? 'cur' : '']" @click="setOneCateIndex(item,index)" v-for="(item, index) in oneCateList" :key="item.id">{{item.title}}</text>
+			</view>	
+			<!-- </scroll-view> -->
+			<view class="grid twoCateList" v-if="twoCateList.length > 0">
+				<u-grid :col="3" border class="u-grid-list">
+						<u-grid-item v-for="(item, index) in twoCateList" :key="item.id" @click="setTwoCateIndex(item, index)">						
+							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.title}}</view>
+						</u-grid-item>					
+					</u-grid>
+			</view>			
+			<view class="titleList">				
+				<u-grid :col="3" v-if="titleList.length > 0">
+						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">						
+							<view :class="['titleItem']">{{item.title}}</view>
+						</u-grid-item>					
+				</u-grid>
+				<u-divider v-else text="暂无穴位数据哦~"></u-divider>
+			</view>
+		</view>
+		
+
+		<!-- <view class="search_box flexbox" @click="">
+			<view class="search">
+				<text class="icon_search"></text>
+				<text class="prompt">请输入穴位名</text>
+			</view>
+		</view> -->
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	export default {
+		data() {
+			return {
+				playData: {},
+				searchValue: '',
+				oneCateList: [], // 一级分类标题1
+				twoCateList: [], // 二级分类标题
+				titleList:[], // 穴位标题
+				curOneCateIndex:0, // 当前选中的一级分类
+				curTwoCateIndex:0 , // 当前选中的二级分类
+				searchList:[], // 搜索结果数组
+				showSearchList: false, 
+			}
+		},
+		onLoad() {
+			this.getCateList()
+		},	
+			onHide() {
+				this.showSearchList = false
+				this.searchList = []
+			},
+		methods: {
+			// 穴位详情
+			gotoDetail(item){
+				uni.navigateTo({
+					url:"./acupointDetail?id=" + item.id
+				})
+			},
+			// 获取穴位名称
+			getTitles(id){
+				$http.request({
+					url: "book/point/getPointsByCategoryId",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						'pointCategoryId': id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0 && res.points.length > 0) {
+						this.titleList = res.points						
+					} else {
+						this.titleList = []				
+					}					
+				}).catch(e => {
+					this.titleList = []		
+					console.log(e)
+				})
+			},
+			setTwoCateIndex(item, index){
+				let id = item.id
+				this.curTwoCateIndex = index
+				this.getTitles(id)
+			},
+			setOneCateIndex(item, index){
+				let id = item.id
+				this.curOneCateIndex = index
+				this.curTwoCateIndex = 0
+				this.getTowCateList(id)
+			},
+			getTowCateList(id){
+				$http.request({
+					url: "book/point/getPointCategoryByPid",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						'id': id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '二级分类获取成功')
+					if (res.code == 0 && res.category.length > 0) {
+						this.twoCateList = res.category
+						this.getTitles(this.twoCateList[0].id)
+					} else {
+						this.twoCateList = []
+						this.titleList = []
+					}					
+				}).catch(e => {
+					this.twoCateList = []	
+					this.titleList = []
+					console.log(e)
+				})
+			},
+			getCateList(id) {
+				id ? '' : id = 0
+				this.twoCateList = []	
+				this.curTwoCateIndex = 0
+				// 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+				$http.request({
+					url: "book/point/getPointCategoryByPid",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						'id': id
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '脉穴分类获取成功')
+					if (res.code == 0 && res.category.length > 0) {
+						this.oneCateList = res.category
+						this.getTowCateList(this.oneCateList[0].id)
+					} else {
+						this.oneCateList = []						
+					}					
+				}).catch(e => {
+					this.oneCateList = []
+					console.log(e)
+				})
+			},
+			getSearch(){
+				$http.request({
+					url: "book/point/searchPointList",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						loadAnimate: 'none', // 请求加载动画
+						'keywords': this.searchValue
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '搜索结果')
+					if (res.code == 0 && res.points.length > 0) {
+						 this.searchList = res.points
+					}
+				}).catch(e => {
+					// this.titleList = []	
+					this.searchList = []
+					console.log(e)
+				})
+			},
+			search(res) {
+				console.log(res,'res')
+				// uni.showToast({
+				// 	title: '搜索：' + res,
+				// 	icon: 'none'
+				// })
+				
+			},
+			input(res) {
+				console.log('----input:', res)
+				if(res == ''){
+					this.searchList = []
+				}else{
+				this.getSearch()
+				}
+			},
+			clear(res) {
+				// uni.showToast({
+				// 	title: 'clear事件，清除值为：',
+				// 	icon: 'none'
+				// })
+				this.showSearchList = false
+			},
+			blur(res) {
+				if(res == ''){
+					this.showSearchList = false
+					this.searchList = []
+				}else{
+				this.getSearch()
+				}
+			},
+			focus(e) {
+				// uni.showToast({
+				// 	title: 'focus事件，输出值为：' + e.value,
+				// 	icon: 'none'
+				// })
+				this.showSearchList = true
+			},
+			// cancel(res) {
+			// 	uni.showToast({
+			// 		title: '点击取消，输入值为：' + res.value,
+			// 		icon: 'none'
+			// 	})
+			// }
+		},
+		onBackPress() {
+			// #ifdef APP-PLUS
+			plus.key.hideSoftKeybord();
+			// #endif
+		},
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.searchList{
+		.item{font-size: 28rpx; padding: 20rpx; border-bottom: 1px solid #dadbde; }
+	}
+	.scroll-view_H{background-color: #fff;white-space: nowrap;
+		 padding:10rpx ; }
+	.contentBox {
+		.oneCateList{ justify-content: space-between;
+			text{ text-align: center;
+				display: inline-block; width: 32%;  padding: 20rpx 0; font-size: 34rpx;  border-radius: 10rpx; 
+			}
+			.cur{background-color:#55aa7f; color: #fff; }
+		}
+		.twoCateList{
+			font-size: 28rpx; margin-top: 20rpx;
+			.grid-text{padding:30rpx 20rpx; text-align: center; }
+			.cur{
+				color: #55aa7f;
+			}
+			// .u-grid-list{border: 0.5px solid #dadbde;}
+		}
+		.titleList{font-size: 26rpx; margin-top: 20rpx; padding: 10rpx; border-radius: 10rpx; background-color: #f8f9fa;
+			.titleItem{padding: 20rpx 0; }			
+		}
+	}
+	
+
+	.container {
+		padding: 10rpx; height: 100vh;
+		background-color: #fff;
+	}
+
+	.search_box {
+		margin: 0 auto; overflow: hidden;
+		margin-top: 20rpx;
+		align-items: center;
+		width: calc(100% - 10px);
+		margin-top: 0;
+		margin-bottom: 40rpx;
+
+		.search {
+			height: 56upx;
+			display: flex;
+			width: 86%;
+			margin: 0 auto;
+			align-items: center;
+			padding: 0upx 40upx;
+			background-color: #fff;
+			border-radius: 20upx;
+			box-shadow: 0 0px 10px 1px #54a96633;
+		}
+
+		.prompt {
+			color: #838383;
+			font-size: 24rpx;
+
+		}
+
+		.icon_search {
+			background-image: url('@/static/icon/map_ic_search.png');
+			background-position: center center;
+			background-repeat: no-repeat;
+			background-size: cover;
+			width: 36upx;
+			height: 36upx;
+			margin-right: 20upx;
+		}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+</style>

pages/acupoint/acupointDetail.vue

@@ -0,0 +1,171 @@
+<template>
+	<view class="container">
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
+		<z-nav-bar :title="'穴位详情-' + acupointDetail.title"></z-nav-bar>
+		<view class="uni-margin-wrap" v-if="acupointDetail && acupointDetail.imageList.length > 0">
+			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
+				:duration="duration">
+				<swiper-item v-for="(item, index) in acupointDetail.imageList" :key="index">
+					<view class="swiper-item">
+						<image :src="item" mode="aspectFit" @click="previewImage(item)"></image>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="contentBox">			
+			<view class="content">
+				<uni-section class="mb-10" titleFontSize="18px" title="穴位名称" type="line">
+					<view class="item">
+						{{acupointDetail.title}}
+					</view>
+				</uni-section>
+				<uni-section class="mb-10" titleFontSize="18px" title="别名" type="line">
+					<view class="item" v-if="acupointDetail.alias && acupointDetail.alias != ''" >
+						{{acupointDetail.alias}}
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="所属经络" type="line">
+					<view class="item" v-html="acupointDetail.meridian">
+						
+					</view>
+				</uni-section>
+				
+				<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 != ''" v-html="acupointDetail.anatomy">
+						
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="主治" type="line">
+					<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 != ''" v-html="acupointDetail.compatibility">
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+				<uni-section class="mb-10" titleFontSize="18px" title="文献" type="line">
+					<view class="item" v-if="acupointDetail.literature && acupointDetail.literature != ''" v-html="acupointDetail.literature">
+						
+					</view>
+					<view class="item" v-else>
+						暂无
+					</view>
+				</uni-section>
+				
+			</view>
+		</view>
+		<music-play :playData="playData"></music-play>
+		<z-navigation></z-navigation>
+	</view>
+</template>
+
+<script>
+	import musicPlay from '@/components/music.vue'
+	import $http from '@/config/requestConfig.js';
+	export default {
+		data() {
+			return {
+				playData: {},
+				acupointDetail: {
+					imageList:[]
+				},
+				acupointId: null,
+				indicatorDots: true,
+				autoplay: true,
+				interval: 5000,
+				duration: 500
+			}
+		},
+		onLoad(e) {
+			this.acupointId = e.id
+		},
+		onShow() {
+			this.getDetail()
+		},
+		methods: {
+			// 放大图片
+			previewImage(url) {
+				console.log(url)
+				uni.previewImage({
+					urls: [url],
+					longPressActions: {
+						itemList: ['很抱歉，暂不支持保存图片到本地'],
+						success: function(res) {
+							// console.log(res,'+++++')
+						}
+					}
+				});
+			},
+			// 穴位详情
+			getDetail() {
+				$http.request({
+					url: "book/point/getPointDetail",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档		
+					data: {
+						// loadAnimate: 'none', // 请求加载动画
+						'pointId': this.acupointId
+					},
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					console.log(res, '内容获取成功')
+					if (res.code == 0) {
+						this.acupointDetail = res.point
+					}
+				}).catch(e => {
+					// this.titleList = []		
+					console.log(e)
+				})
+			}
+		},
+		components: {
+			musicPlay
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentBox{padding-bottom: 20rpx;}
+	.mb-10{ margin-bottom: 10px;}
+	.content{font-size: 28rpx;}
+	.swiper-item{
+		image{margin: 0 auto; height:250rpx;}
+		
+	}
+	.uni-margin-wrap{ margin-bottom: 20rpx; padding-top: 20rpx;
+		background-color: #fff;
+	}
+	.container {
+		padding: 10rpx;
+		// background-color: #fff;
+		.item{color: #666; padding:10rpx 20rpx; padding-bottom: 20rpx; line-height: 46rpx;}
+	}
+
+	.flexbox {
+		display: flex;
+	}
+	
+	/deep/ .uni-section-header__decoration.line{background-color: #18bc37;}
+</style>

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'

pages/eBook/bookContent.vue

@@ -22,7 +22,7 @@
 					<uni-tag class="tag" @click="toMore()" :inverted="true" text="书评" type="success"></uni-tag>
 					<uni-tag @click="gotoListen()"  class="tag" v-if="bookMessage.canListen" :inverted="true" text="听书" type="primary"></uni-tag>									
 					<!-- 1:打卡，2不打卡 -->
-					<uni-tag  @click="gotoclock()" v-if="bookMessage.clockIn == 1" class="tag" :inverted="true" text="签到" type="warning"></uni-tag>
+					<uni-tag  @click="gotoclock()" v-if="bookMessage.clockIn == 1" class="tag" :inverted="true" text="打卡" type="warning"></uni-tag>
 					<uni-tag  @click="goJiangShu()" v-if="bookMessage.teachIn == 1" class="tag" :inverted="true" text="讲书" type="error"></uni-tag>
 				</view>
 				<view class="buy" v-if="!bookMessage.isBuy">

pages/peanut/home.vue

@@ -3,18 +3,43 @@
 		<!-- <z-nav-bar backState="2000" title="首页"></z-nav-bar> -->
 		<view class="home_bg">
 			<view class="" style=" ">
-				<view class="icon_hua">
+				
-					<image src="../../static/icon/home_icon_3.png" mode="aspectFit" class="icon_hua_1"></image>
+					<view class="icon_hua">
-				</view>	
+						<image src="../../static/icon/home_icon_1.png" mode="aspectFit" class="icon_hua_1"></image>
-				<view class="hehan">
+					</view>	
-					<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
+					<view class="hehan">
-				</view>	
+						<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
-				<view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
+					</view>	
+							
+				<view class="fiveIcon flexbox" style="justify-content: space-around;">
+					<div class="item item1" @click="onPageJump('../acupoint/acupoint')">
+						<image src="../../static/icon/five1.png" mode="aspectFit" ></image>
+						<text>经穴检索</text>
+					</div>
+					<!-- <div class="item item1">
+						<image src="../../static/icon/five2.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>
+					</div> -->
+				</view>
+				<!-- <view class="search_box flexbox" @click="onPageJump('../peanut/searchFor')">
 					<view class="search">
 						<text class="icon_search"></text>
 						<text class="prompt">请输入书名</text>
 					</view>				
-				</view>
+				</view> -->
 				<!-- <view class="searBtn flexbox">
 					<text>搜索</text>
 				</view> -->
@@ -27,24 +52,24 @@
 		<!-- <view class="home_nar" v-if="showEbook"> -->
 		<view class="home_nar">	
 				<view class="hn_cl_tit shuguan" @click="onPageJump('../clock/index')">
-					<image src="../../static/icon/home1.png" mode="aspectFit"></image>
+					<image src="../../static/icon/home1-1.png" mode="aspectFit"></image>
-					<text>打 卡</text>
+					<!-- <text>打 卡</text> -->
 				</view>	
 						
 			<view  class="hn_cl_tit dianzishu" @click="onPageJump('../listen/home')">
-				<image src="../../static/icon/home2.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home2-1.png" mode="aspectFit"></image>
-				<text>听 书</text>
+				<!-- <text>听 书</text> -->
 			</view>			
 			
 			<!-- <view class="hn_cl_tit" @click="onPageJump('../bookShop/bookShopIndex')"> -->			
 			<view class="hn_cl_tit shuping" @click="onPageJump('../comments/commentsList')">
-				<image src="../../static/icon/home3.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home3-1.png" mode="aspectFit"></image>
-				<text>书 评</text>
+				<!-- <text>书 评</text> -->
 			</view>
 			
 			<view class="hn_cl_tit chaoshi" @click="onPageJump('../talkBook/talkBook')">
-				<image src="../../static/icon/home4.png" mode="aspectFit"></image>
+				<image src="../../static/icon/home4-1.png" mode="aspectFit"></image>
-				<text>讲 书</text>
+				<!-- <text>讲 书</text> -->
 			</view>		
 		</view>
 
@@ -102,14 +127,14 @@
 			</view>
 		</view> -->
 
-		<view class="head_line" >
+		<view class="head_line" style="background-color: #fff;">
 			<b></b>
 			<text>新书上市</text>
 			<!-- <i @click="onBookMore('New')">查看更多 ></i> -->
 		</view>
 		
 		<view class="newBook">			
-			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10">
+			<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10" style="margin-top: 0 !important;">
 				<view :class="['item']"  v-for="(item,index) in newBookList" :key="index">
 						<view class="videoBox" @click="goDetail(item.productId)">
 							<image  v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill"></image>
@@ -687,6 +712,12 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
+	.fiveIcon{justify-content: space-between; text-align: center;
+		text{
+			font-size: 28rpx;  color: #11a669;
+		}	
+			image{width: 56rpx; height: 56rpx; margin: 0 auto; }
+	}
 	.hehan{width: 80%; margin: 10rpx auto;}
 	.zhekou{
 		.goodsName{margin-bottom: 20rpx;}
@@ -695,24 +726,26 @@
 	.priceAndnum{ font-size: 24rpx !important;
 		.price{color: #9b9b9b !important; font-size: inherit; font-weight: normal !important; display: block;}
 	}
-	.ProTabs{margin: 20rpx 0; padding:0 20rpx;
+	.ProTabs{
-		text{padding: 12rpx 14rpx; font-size: 32rpx;  border-radius: 10rpx; overflow: hidden; 
+		// margin: 20rpx 0; 
+	padding:0 20rpx;
+		text{padding: 8rpx 14rpx; font-size: 32rpx; display: inline-block; border-radius: 10rpx; overflow: hidden; 
 		// background-color: #eee;
 		 color: #55aa7f; margin-right: 10rpx;}
 		text.cur{background-color:#55aa7f ; color: #fff;}
 	}
-	.newBook{margin-top: 20rpx;}
+	// .newBook{margin-top: 10rpx;}
 	.scroll-view_H{background-color: #fff;white-space: nowrap;
-		 padding:10rpx ; }
+		 padding:10rpx ; margin-top: 12rpx;}
 	.scroll-view_H{ 
-		.item { padding: 10rpx; overflow: hidden; display: inline-block;
+		.item { padding: 10rpx; overflow: hidden; display: inline-block; padding-bottom: 0;
 			width: 180rpx !important; margin-right: 20rpx;  border-radius: 10rpx;
 			.videoBox{ 
 				image{display: block; width:150rpx; 
 				height: 170rpx; 
 				}
 			}
-			.bookName{display: block; margin-top: 20rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
+			.bookName{display: block; margin-top: 6rpx;   color: #666; font-size: 24rpx; white-space: nowrap;					
 		overflow-x: hidden; overflow: hidden;
 		text-overflow: ellipsis;}
 		}
@@ -720,7 +753,8 @@
 	}
 	.flexbox{display: flex;}
 	.head_line {
-		margin: 20rpx 0 0 0;
+		padding-top: 8rpx;
+		margin: 12rpx 0 0 0;
 
 
 		b {
@@ -762,8 +796,8 @@
 			image{width: 150rpx; height: 80rpx;}
 		}
 		.icon_hua{width: 100%; text-align: center; display: block;
-		image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
+				image{width: 150rpx; height: 150rpx;  margin: 0 auto;}
-		}
+				}
 		.search_box { margin: 0 auto; margin-top: 20rpx;  align-items: center;
 			width: calc(100% - 30rpx);   margin-top: 0;
     margin-bottom: 20rpx;
@@ -797,29 +831,31 @@
 			font-size: 30rpx; color: #fff; 
 		}
 }
-	.home_nar { 
+	.home_nar {
-		margin: 30rpx 20rpx; justify-content: space-between;
+		background-color: #fff;
+		padding: 20rpx 30rpx;
+		 justify-content: space-between;
 		display: flex;
 		color: #333; 
-		// margin-bottom: 0;
+		 margin-bottom: 0;
 		// .dianzishu{  margin-right:10rpx;	
 		// 	background-color:#f8d6f4 ;  border: 2px solid #edcce9;
 		// }
 		// .chaoshi{background-color:#fff2d8 ;  border: 2px solid #ede6d3;	}
 		// .shuping{ background-color: #d6ffda; border: 2px solid #bae9bf;}
 		// .shuguan{ background-color:#e3f9f9 ;  border: 2px solid #d7eced; }
-		.hn_cl_tit { padding-bottom: 10rpx;
+		.hn_cl_tit { 
 			// width: 23%;
 			width: 31%; 
 			text-align: center;			 
-			 border-radius: 20rpx ;	padding-top: 10rpx;	
+			 border-radius: 20rpx ;		
 			// line-height: 110upx;
 			//display: flex;
 			align-content: center;
 			justify-content: center;
 			image {				
-				width:90%;
+				width:120rpx;
-				height:156rpx;
+				height:120rpx;
 				display: block;
 				margin: 0 auto;
 				// margin: 0 20rpx;
@@ -1088,13 +1124,13 @@
 
 	.goods {
 		width: 100%;
-	margin:18rpx 0 50rpx 0;
+	margin:0 0 50rpx 0; background-color: #fff;
 
 		.goodsItem {
 			display: inline-block;
 			width: 46%;
 			border-radius: 20rpx;
-			padding: 25rpx 25rpx 20rpx 25rpx;
+			padding: 25rpx; padding-bottom: 5rpx;
 			margin: 0 20rpx 20rpx 20rpx;
 			background-color: #fff;
 			border: 1px solid #eee;
@@ -1109,12 +1145,12 @@
 
 				.goodsName {
 					margin-top: 10rpx;
-					font-size: 30rpx;
+					font-size: 28rpx;
 					// font-weight: bold;
 				}
 
 				.goodsPrice {
-					font-size: 30rpx;
+					font-size: 28rpx;
 					margin: 5rpx 0 0 3rpx;					
 					display: flex; justify-content: space-between;
 					.price{

pages/peanut/mine.vue

@@ -89,7 +89,8 @@
 			<!-- <view class="nav_list" @click="onGoing()">
 				<text>帮助与反馈11111</text>
 			</view> -->			
-			<view class="nav_list" @click="newOnShare" v-if="isAndorid">
+			<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
+			<view class="nav_list" @click="newOnShare">
 				<text>分享App</text>
 			</view>
 			<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
@@ -122,7 +123,7 @@
 	import $http from '@/config/requestConfig.js';
 	// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
 	import {
-		mapState
+		mapState,mapMutations
 	} from 'vuex';
 	export default {
 		data() {
@@ -160,6 +161,7 @@
 		},
 		//方法
 		methods: {
+			...mapMutations(['setUserInfo']),
 			// 获得操作系统
 			getOS(){
 				let oprateOs = ''				
@@ -278,6 +280,7 @@
 			// 退出登录
 			signOut() {
 				this.signShow = false
+				this.setUserInfo({'token': null})
 				uni.reLaunch({
 					url: '../user/login'
 				});

pages/talkBook/talkBookDetail.vue

@@ -4,9 +4,24 @@
 		<view class="mainContent">
 			<view class="title">{{talkBookDetail.title}}</view>
 			<view class="voices" v-if="talkBookDetail.voices != '' && audioShow">
-				<audio style="text-align: left;  overflow: hidden;" :src="talkBookDetail.voices" @play="audioPlay"
+				<!-- <audio style="text-align: left;  overflow: hidden;" :src="talkBookDetail.voices" @play="audioPlay"
 					poster="../../static/icon/home_icon_0.png" :name="talkBookDetail.title"
-					:author="bookInfo.author.authorName" :action="audioAction" controls></audio>
+					:author="bookInfo.author.authorName" :action="audioAction" controls @timeupdate="updateTime"></audio> -->
+				<!-- 下面自己写了个播放器 -->
+				<view class="audiobox">
+					<view class="audioinfo">
+						<image class="audioimg" :src="bookInfo.images" mode="aspectFit"></image>
+						<image class="audioimgstart" v-if="!this.paused" mode="aspectFit" src="../../static/audiostart.png" @click="start"></image>
+						<image class="audioimgstart" v-else mode="aspectFit" src="../../static/audiostop.png" @click="start"></image>
+						<view>
+							<view class="audiotitle">{{talkBookDetail.title}}</view>
+							<view class="audioauthor">{{bookInfo.author.authorName}}</view>
+							<view class="audioauthor">{{currentTime+'/'+duration}}秒</view>
+							<slider class="audioslider" block-size="12" v-model="currentTime" :max="duration" @change="changeTime"></slider>
+							<!-- <view @click="start">点击播放/暂停</view> -->
+						</view>
+					</view>
+				</view>
 			</view>
 			<view class="content" v-if="talkBookDetail.content != ''" v-html="talkBookDetail.content"></view>
 			<view class="content" v-else></view>
@@ -68,6 +83,10 @@
 				}, // 书籍信息
 				talkBookDetail: {},
 				windowWidth: 0,
+				audio: null,
+				duration: 10,
+				currentTime: 0,
+				paused: false
 			}
 		},
 		onLoad(e) {
@@ -75,16 +94,55 @@
 			console.log(e, 'onLoad')
 			this.bookId = e.bookId
 			this.teachId = e.teachId
+
+			// 初始化播放器实例
+			this.audio = uni.createInnerAudioContext();
 		},
 		onShow() {
 			this.getBookInfo()
 			this.getTalkBookDetail()
 		},
+		onHide() {
+			// console.log('onHide----',this.paused)
+			this.audio.pause() // 暂停播放
+			this.paused = false
+		},
+		onUnload() {
+			// console.log('onUnload----',this.paused)
+			this.audio.destroy() // 销毁播放器
+		},
 		computed: {
 			...mapState(['userInfo'])
 		},
 		methods: {
 			...mapMutations(['setUserInfo']),
+			start(){
+				this.initAudio() // 开始播放
+			},
+			initAudio(){
+				this.audio.onTimeUpdate(()=>{
+					this.duration = this.audio.duration.toFixed()
+					this.currentTime = this.audio.currentTime.toFixed()
+				})
+				this.audio.onPause(()=>{ // 用于被听书组件打断时，设置播放icon状态
+					this.paused = false
+					// console.log('onPause----------',this.paused)
+				})
+				this.paused = this.audio.paused
+				// console.log('paused',this.paused)
+				if(this.paused){
+					this.audio.play()
+				}else{
+					this.audio.pause()
+				}
+			},
+			updateTime(e){
+				this.currentTime = e.detail.currentTime.toFixed()
+				this.duration = e.detail.duration.toFixed()
+			},
+			changeTime(e){
+				this.audio.seek(e.detail.value) // 设置播放位置
+			},
 			audioPlay(){
 				console.log('播放讲书',this.$music)				
 				this.$music.setCloseBgm()	 // 关闭听书音频
@@ -140,6 +198,11 @@
 							console.log(res, 'res')
 							this.talkBookDetail = res.bookTeach
 
+							this.audio.src = this.talkBookDetail.voices // 设置播放资源路径
+							this.audio.onCanplay((e)=>{
+								this.duration = this.audio.duration.toFixed() // 初始化进度条和音频秒数
+							})
+
 							// this.isBuy = res.book.isBuy
 							// this.freeChapterCount = res.book.freeChapterCount
 						} else {
@@ -239,6 +302,43 @@
 			border-radius: 5px;
 		}
 	}
+	// 自定义播放器样式
+	.audiobox{
+		border:  2rpx solid #d6d5d5;
+		border-radius: 8px;
+		.audioinfo{
+			display: flex;
+			.audioimg{
+				padding: 10rpx;
+				width: 180rpx;
+				height: 220rpx;
+				border-radius: 5px;
+			}
+			.audioimgstart{
+				position: absolute;
+				padding: 20rpx;
+				width: 180rpx;
+				height: 220rpx;
+				border-radius: 5px;
+			}
+			.audiotitle{
+				padding: 10rpx;
+				font-size: 28rpx;
+				text-align: left;
+			}
+			.audioauthor{
+				padding: 4rpx;
+				font-size: 24rpx;
+				text-align: left;
+				color: #999;
+			}
+			.audioslider{
+				width: 400rpx;
+			}
+		}
+		
+		
+	}
 
 	// .opbtn{font-size: 14rpx;}
 </style>

pages/user/addAddress.vue

@@ -253,7 +253,7 @@
 
 			},
 			changeHandler(e) { //城市选择时触发
-			console.log(e,'变化了',this.columnData, this.columnDatas)
+			// console.log(e,'变化了',this.columnData, this.columnDatas)
 			this.addressChanged = true
 				const {
 					columnIndex, //当前选择的列，省 / 市 / 区
@@ -278,7 +278,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

pages/user/login.vue

@@ -15,10 +15,32 @@
 				<!-- <view class="title" :class="{ active: type == 2000 }" @click="type = 2000">验证码登录/注册</view>
 				<view class="title" :class="{ active: type == 1000 }" @click="type = 1000">密码登录</view> -->
 			</view>
-			<view class="input_tit">手机号</view>
+			<view class="flexbox" style=" margin-top: 20rpx;">
-			<view class="input_box triangle" :clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+				<view class="input_tit" style="margin-top: 0; margin-right: 20rpx;">手机号</view>
-				<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" />
+				<view class="quhao">
+					<uni-data-select class="myselect" placeholder="选择区号" v-model="quCode" :localdata="quCodeList" style="height: 30rpx !important;"
+						@change="quChange"></uni-data-select>
+				</view>
 			</view>
+			<!-- 带区号 -->
+			<view class="flexbox " style="margin:36rpx 0; justify-content: space-between;">
+				<view class="triangle borderBottom phoneNumberInput" style="width: 150rpx;">
+					<input type="number" v-model="quCode" placeholder="区号" placeholder-class="grey" />
+					
+				</view>
+				<view class="triangle borderBottom phoneNumberInput"
+					:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+					<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号"
+						placeholder-class="grey" />
+				</view>
+			</view>
+
+			<!-- 不带区号 -->
+			<!-- <view class="triangle borderBottom phoneNumberInput input_box"
+				:clasfs="[type == 1000 ? 'left_triangle': 'right_triangle']">
+				<input type="number" v-model="phone" @input="onInput" placeholder="请输入您的手机号" placeholder-class="grey" />
+			</view> -->
+
 			<view class="input_tit" v-if="type == 1000">密码</view>
 			<view class="input_box" v-if="type == 1000">
 				<input class="input_item" v-model="password" @input="onInput" :password="!isSee" placeholder="请输入密码"
@@ -46,7 +68,7 @@
 				和
 				<span class="highlight" @click="showXieyi('privacy')">《隐私协议》</span>
 				<!-- <text @click="onPageJump('/pages/user/protocol')">《隐私协议》</text>-->
-			</view> 
+			</view>
 			<view class="btn_box">
 				<button @click="onSubmit" class="active" v-if="btnShow">登 录</button>
 				<button v-else>登 录</button>
@@ -61,11 +83,11 @@
 					<image src="../../static/icon/ic_login_health.png" @click="onHealthLogin" mode="aspectFit"></image>
 				</view>
 			</view>
-			
+
 			<view class="qie_huan" style="display: flex; justify-content: center;">
 				<view style="width: 30%;" @click="type = 1000" v-if="type == 2000">密码登录</view>
 				<view style="width:50%; display: flex; justify-content:space-between;" v-if="type == 1000">
-					<text  @click="type = 2000">验证码登录</text>
+					<text @click="type = 2000">验证码登录</text>
 					<text v-if="type == 1000" @click="onPageJump('/pages/user/forget')">忘记密码？</text>
 					<!-- <text @click="resetPassWord()">忘记密码</text> -->
 				</view>
@@ -102,9 +124,9 @@
 						<view @click="onSubmit_Health">确定</view>
 					</view>
 				</view>
-			</z-popup>		
+			</z-popup>
 
-			<!-- #ifdef APP-PLUS -->  
+			<!-- #ifdef APP-PLUS -->
 			<!-- <view class="third_party_login_box" v-if="isIos && system >= 13">6
 				<view class="third_party_title"><text>第三方登录</text></view>
 				<view class="third_party_content">
@@ -115,24 +137,24 @@
 				</view>
 			</view> -->
 			<!-- #endif -->
-			
+
 			<u-popup :show="xieyiShow" :round="10" @close="xieyiShow=false">
 				<view class="tanchu">
-					<view class="dp_title">{{xieyi.title}}</view> 
+					<view class="dp_title">{{xieyi.title}}</view>
-					 <view style="max-height: 1000rpx;overflow-y: scroll;">
+					<view style="max-height: 1000rpx;overflow-y: scroll;">
 						<view v-html="xieyi.Content"></view>
-					</view>						
+					</view>
 				</view>
 			</u-popup>
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
 	import $http from '@/config/requestConfig.js';
 	import md5 from '@/plugins/md5';
-	
+
 	import localuserxieyi from '@/static/json/userAndyinsiP.json'
 	import localyinsixieyi from '@/static/json/yinsiP.json'
 	var clear;
@@ -167,11 +189,15 @@
 				health_phone: '',
 				health_password: '',
 				isSee_H: false,
-				xieyiShow : false,
+				xieyiShow: false,
-				xieyi:{
+				xieyi: {
-					title:'',
+					title: '',
-					Content:''
+					Content: ''
-				}
+				},
+				quShow: false,
+				quCodeList: [], // 国家区域码
+				quCode: 86,
+
 			};
 		},
 		//第一次加载
@@ -187,28 +213,63 @@
 			// #endif
 		},
 		//页面显示
-		onShow() {},
+		onShow() {
+			this.getCountyCode()
+		},
 		//方法
 		methods: {
 			...mapMutations(['setUserInfo']),
 			...mapMutations(['setHealthMes']),
+			// 获取国家区域编码
+			getCountyCode() {
+				$http.request({
+						url: "book/baseArea/getAllBaseArea",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						// console.log(res,'区域码')
+						if (res.code == 0 && res.baseAreas.length > 0) {
+							//	this.quCodeList = res.baseAreas
+							this.quCodeList = res.baseAreas.map(item => {
+								let obj = {
+									'text': item.title,
+									'value': item.code,
+								}
+								return obj
+							})
+							// console.log('改变格式后',this.quCodeList)						
+						} else {
+							this.quCodeList = []
+							// this.totalPage = 0
+						}
+					}).catch(e => {
+						console.log(e, 'e')
+					});
+			},
+			quChange(e) {
+				console.log(e, 'e')
+			},
 			// 修改密码
-			resetPassWord(){
+			resetPassWord() {
 				console.log('重置密码')
 				uni.navigateTo({
 					url: "/pages/home/shop/goodsDetail"
 				})
 			},
 			// 显示协议
-			showXieyi(str){	
+			showXieyi(str) {
-				if(str == 'user'){
+				if (str == 'user') {
 					this.xieyi = localuserxieyi
-				}else{
+				} else {
 					this.xieyi = localyinsixieyi
 				}
 				//console.log(localuserxieyi)				
 				this.xieyiShow = true
-								
+
 			},
 			onPageJump(url) {
 				uni.navigateTo({
@@ -262,12 +323,15 @@
 					});
 					return;
 				}
-				if (!this.$base.phoneRegular.test(this.phone)) {
+				if (this.quCode == null || this.quCode == 86) { // 如果没选择国家code，默认是中国大陆
-					uni.showToast({
+					if (!this.$base.phoneRegular.test(this.phone)) {
-						title: '手机格式不正确',
+						uni.showToast({
-						icon: 'none'
+							title: '手机格式不正确',
-					});
+							icon: 'none'
-					return;
+						});
+						return;
+					}
+					console.log(this.quCode, '选择的区段')
 				}
 				if (!this.agree) {
 					uni.showToast({
@@ -280,6 +344,7 @@
 				this.$http
 					.get('book/user/sms/sendcode', {
 						phone: this.phone,
+						areaCode: this.quCode,
 						type: 2000
 					})
 					.then(res => {
@@ -307,12 +372,14 @@
 					});
 					return;
 				}
-				if (!this.$base.phoneRegular.test(this.phone)) {
+				if (this.quCode == null || this.quCode == 86) {
-					uni.showToast({
+					if (!this.$base.phoneRegular.test(this.phone)) {
-						title: '手机格式不正确',
+						uni.showToast({
-						icon: 'none'
+							title: '手机格式不正确',
-					});
+							icon: 'none'
-					return;
+						});
+						return;
+					}
 				}
 				let httpData = {};
 				if (this.type == 2000) {
@@ -603,12 +670,40 @@
 </script>
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-.highlight{color: $themeColor;}
+	.myselect{height: 50rpx !important;}
-.tanchu {
+	.phoneNumberInput {
+		width: calc(100% - 160rpx);
+		// width: 100%;
+		height: 67rpx;
+
+		input {
+			font-size: 28rpx;
+			margin: 20rpx 0;
+		}
+	}
+
+	.borderBottom {
+		border-bottom: 1px solid #efeef4;
+	}
+
+	.flexbox {
+		display: flex;
+	}
+
+	.quhao {
+		height: 50rpx;
+		width: 180rpx;
+	}
+
+	.highlight {
+		color: $themeColor;
+	}
+
+	.tanchu {
 		padding: 40rpx 30rpx 40rpx 30rpx;
 		position: relative;
-	
+
-	
+
 		.dp_title {
 			font-size: 32rpx;
 			margin-bottom: 50rpx;
@@ -616,10 +711,11 @@
 			text-align: center;
 			font-weight: bold;
 		}
-	
+
-		
+
-		
+
 	}
+
 	.logo_bg {
 		background-image: url('@/static/icon/login_bg.png');
 		// background-position: center center;
@@ -771,6 +867,7 @@
 
 		.btn_box {
 			margin-top: 40rpx;
+
 			button {
 				font-size: 32rpx;
 				background-color: #e5e5e5;
@@ -921,10 +1018,10 @@
 			}
 		}
 	}
-	
+
-	.qie_huan{
+	.qie_huan {
 		font-size: 26rpx;
 		margin: 20rpx 0 0 0;
 		text-align: center;
 	}
-</style>
+</style>

static/json/address.json

@@ -14781,7 +14781,15 @@
                 "createDate": 1666867907000
             },
             {
-                "countyList": [],
+                "countyList": [
+					{
+					    "regionCode": "441900",
+					    "countyId": 8446,
+					    "cityId": 949,
+					    "countyName": "东莞市",
+					    "createDate": 1699422943745
+					}
+				],
                 "regionCode": "441900",
                 "cityName": "东莞市",
                 "cityId": 949,
@@ -14789,7 +14797,15 @@
                 "createDate": 1666867907000
             },
             {
-                "countyList": [],
+                "countyList": [
+					{
+					    "regionCode": "442000",
+					    "countyId": 8447,
+					    "cityId": 950,
+					    "countyName": "中山市",
+					    "createDate": 1699423000757
+					}
+				],
                 "regionCode": "442000",
                 "cityName": "中山市",
                 "cityId": 950,

uni_modules/uni-data-select/changelog.md

@@ -0,0 +1,35 @@
+## 1.0.6（2023-04-12）
+- 修复 微信小程序点击时会改变背景颜色的 bug
+## 1.0.5（2023-02-03）
+- 修复 禁用时会显示清空按钮
+## 1.0.4（2023-02-02）
+- 优化 查询条件短期内多次变更只查询最后一次变更后的结果
+- 调整 内部缓存键名调整为 uni-data-select-lastSelectedValue
+## 1.0.3（2023-01-16）
+- 修复 不关联服务空间报错的问题
+## 1.0.2（2023-01-14）
+- 新增  属性 `format` 可用于格式化显示选项内容
+## 1.0.1（2022-12-06）
+- 修复  当where变化时，数据不会自动更新的问题
+## 0.1.9（2022-09-05）
+- 修复 微信小程序下拉框出现后选择会点击到蒙板后面的输入框
+## 0.1.8（2022-08-29）
+- 修复 点击的位置不准确
+## 0.1.7（2022-08-12）
+- 新增 支持 disabled 属性
+## 0.1.6（2022-07-06）
+- 修复 pc端宽度异常的bug
+## 0.1.5
+- 修复 pc端宽度异常的bug
+## 0.1.4（2022-07-05）
+- 优化 显示样式
+## 0.1.3（2022-06-02）
+- 修复 localdata 赋值不生效的 bug
+- 新增 支持  uni.scss 修改颜色
+- 新增 支持选项禁用（数据选项设置 disabled: true 即禁用）
+## 0.1.2（2022-05-08）
+- 修复 当 value 为 0 时选择不生效的 bug
+## 0.1.1（2022-05-07）
+- 新增 记住上次的选项（仅 collection 存在时有效）
+## 0.1.0（2022-04-22）
+- 初始化

uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue

@@ -0,0 +1,517 @@
+<template>
+	<view class="uni-stat__select">
+		<span v-if="label" class="uni-label-text hide-on-phone">{{label + '：'}}</span>
+		<view class="uni-stat-box" :class="{'uni-stat__actived': current}">
+			<view class="uni-select" :class="{'uni-select--disabled':disabled}">
+				<view class="uni-select__input-box" @click="toggleSelector">
+					<view v-if="current" class="uni-select__input-text">{{current}}</view>
+					<view v-else class="uni-select__input-text uni-select__input-placeholder">{{typePlaceholder}}</view>
+					<view v-if="current && clear && !disabled" @click.stop="clearVal" >
+						<uni-icons type="clear" color="#c0c4cc" size="24"/>
+					</view>
+					<view v-else>
+						<uni-icons :type="showSelector? 'top' : 'bottom'" size="14" color="#999" />
+					</view>
+				</view>
+				<view class="uni-select--mask" v-if="showSelector" @click="toggleSelector" />
+				<view class="uni-select__selector" v-if="showSelector">
+					<view class="uni-popper__arrow"></view>
+					<scroll-view scroll-y="true" class="uni-select__selector-scroll">
+						<view class="uni-select__selector-empty" v-if="mixinDatacomResData.length === 0">
+							<text>{{emptyTips}}</text>
+						</view>
+						<view v-else class="uni-select__selector-item" v-for="(item,index) in mixinDatacomResData" :key="index"
+							@click="change(item)">
+							<text :class="{'uni-select__selector__disabled': item.disable}">{{formatItemName(item)}}</text>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * DataChecklist 数据选择器
+	 * @description 通过数据渲染的下拉框组件
+	 * @tutorial https://uniapp.dcloud.io/component/uniui/uni-data-select
+	 * @property {String} value 默认值
+	 * @property {Array} localdata 本地数据 ，格式 [{text:'',value:''}]
+	 * @property {Boolean} clear 是否可以清空已选项
+	 * @property {Boolean} emptyText 没有数据时显示的文字 ，本地数据无效
+	 * @property {String} label 左侧标题
+	 * @property {String} placeholder 输入框的提示文字
+	 * @property {Boolean} disabled 是否禁用
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: "uni-data-select",
+		mixins: [uniCloud.mixinDatacom || {}],
+		props: {
+			localdata: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			label: {
+				type: String,
+				default: ''
+			},
+			placeholder: {
+				type: String,
+				default: '请选择'
+			},
+			emptyTips: {
+				type: String,
+				default: '无选项'
+			},
+			clear: {
+				type: Boolean,
+				default: true
+			},
+			defItem: {
+				type: Number,
+				default: 0
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			// 格式化输出 用法 field="_id as value, version as text, uni_platform as label" format="{label} - {text}"
+			format: {
+				type: String,
+				default: ''
+			},
+		},
+		data() {
+			return {
+				showSelector: false,
+				current: '',
+				mixinDatacomResData: [],
+				apps: [],
+				channels: [],
+				cacheKey: "uni-data-select-lastSelectedValue",
+			};
+		},
+		created() {
+			this.debounceGet = this.debounce(() => {
+				this.query();
+			}, 300);
+			if (this.collection && !this.localdata.length) {
+				this.debounceGet();
+			}
+		},
+		computed: {
+			typePlaceholder() {
+				const text = {
+					'opendb-stat-app-versions': '版本',
+					'opendb-app-channels': '渠道',
+					'opendb-app-list': '应用'
+				}
+				const common = this.placeholder
+				const placeholder = text[this.collection]
+				return placeholder ?
+					common + placeholder :
+					common
+			},
+			valueCom(){
+				// #ifdef VUE3
+				return this.modelValue;
+				// #endif
+				// #ifndef VUE3
+				return this.value;
+				// #endif
+			}
+		},
+		watch: {
+			localdata: {
+				immediate: true,
+				handler(val, old) {
+					if (Array.isArray(val) && old !== val) {
+						this.mixinDatacomResData = val
+					}
+				}
+			},
+			valueCom(val, old) {
+				this.initDefVal()
+			},
+			mixinDatacomResData: {
+				immediate: true,
+				handler(val) {
+					if (val.length) {
+						this.initDefVal()
+					}
+				}
+			}
+		},
+		methods: {
+			debounce(fn, time = 100){
+				let timer = null
+				return function(...args) {
+					if (timer) clearTimeout(timer)
+					timer = setTimeout(() => {
+						fn.apply(this, args)
+					}, time)
+				}
+			},
+			// 执行数据库查询
+			query(){
+				this.mixinDatacomEasyGet();
+			},
+			// 监听查询条件变更事件
+			onMixinDatacomPropsChange(){
+				if (this.collection) {
+					this.debounceGet();
+				}
+			},
+			initDefVal() {
+				let defValue = ''
+				if ((this.valueCom || this.valueCom === 0) && !this.isDisabled(this.valueCom)) {
+					defValue = this.valueCom
+				} else {
+					let strogeValue
+					if (this.collection) {
+						strogeValue = this.getCache()
+					}
+					if (strogeValue || strogeValue === 0) {
+						defValue = strogeValue
+					} else {
+						let defItem = ''
+						if (this.defItem > 0 && this.defItem <= this.mixinDatacomResData.length) {
+							defItem = this.mixinDatacomResData[this.defItem - 1].value
+						}
+						defValue = defItem
+					}
+          if (defValue || defValue === 0) {
+					  this.emit(defValue)
+          }
+				}
+				const def = this.mixinDatacomResData.find(item => item.value === defValue)
+				this.current = def ? this.formatItemName(def) : ''
+			},
+
+			/**
+			 * @param {[String, Number]} value
+			 * 判断用户给的 value 是否同时为禁用状态
+			 */
+			isDisabled(value) {
+				let isDisabled = false;
+
+				this.mixinDatacomResData.forEach(item => {
+					if (item.value === value) {
+						isDisabled = item.disable
+					}
+				})
+
+				return isDisabled;
+			},
+
+			clearVal() {
+				this.emit('')
+				if (this.collection) {
+					this.removeCache()
+				}
+			},
+			change(item) {
+				if (!item.disable) {
+					this.showSelector = false
+					this.current = this.formatItemName(item)
+					this.emit(item.value)
+				}
+			},
+			emit(val) {
+				this.$emit('input', val)
+				this.$emit('update:modelValue', val)
+				this.$emit('change', val)
+				if (this.collection) {
+					this.setCache(val);
+				}
+			},
+			toggleSelector() {
+				if (this.disabled) {
+					return
+				}
+
+				this.showSelector = !this.showSelector
+			},
+			formatItemName(item) {
+				let {
+					text,
+					value,
+					channel_code
+				} = item
+				channel_code = channel_code ? `(${channel_code})` : ''
+
+				if (this.format) {
+					// 格式化输出
+					let str = "";
+					str = this.format;
+					for (let key in item) {
+						str = str.replace(new RegExp(`{${key}}`,"g"),item[key]);
+					}
+					return str;
+				} else {
+					return this.collection.indexOf('app-list') > 0 ?
+						`${text}(${value})` :
+						(
+							text ?
+							text :
+							`未命名${channel_code}`
+						)
+				}
+			},
+			// 获取当前加载的数据
+			getLoadData(){
+				return this.mixinDatacomResData;
+			},
+			// 获取当前缓存key
+			getCurrentCacheKey(){
+				return this.collection;
+			},
+			// 获取缓存
+			getCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				return cacheData[name];
+			},
+			// 设置缓存
+			setCache(value, name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				cacheData[name] = value;
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+			// 删除缓存
+			removeCache(name=this.getCurrentCacheKey()){
+				let cacheData = uni.getStorageSync(this.cacheKey) || {};
+				delete cacheData[name];
+				uni.setStorageSync(this.cacheKey, cacheData);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-base-color: #6a6a6a !default;
+	$uni-main-color: #333 !default;
+	$uni-secondary-color: #909399 !default;
+	$uni-border-3: #e5e5e5;
+
+
+	/* #ifndef APP-NVUE */
+	@media screen and (max-width: 500px) {
+		.hide-on-phone {
+			display: none;
+		}
+	}
+
+	/* #endif */
+	.uni-stat__select {
+		display: flex;
+		align-items: center;
+		// padding: 15px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+		width: 100%;
+		flex: 1;
+		box-sizing: border-box;
+	}
+
+	.uni-stat-box {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-stat__actived {
+		width: 100%;
+		flex: 1;
+		// outline: 1px solid #2979ff;
+	}
+
+	.uni-label-text {
+		font-size: 14px;
+		font-weight: bold;
+		color: $uni-base-color;
+		margin: auto 0;
+		margin-right: 5px;
+	}
+
+	.uni-select {
+		font-size: 14px;
+		border: 1px solid $uni-border-3;
+		box-sizing: border-box;
+		border-radius: 4px;
+		padding: 0 5px;
+		padding-left: 10px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		user-select: none;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		border-bottom: solid 1px $uni-border-3;
+		width: 100%;
+		flex: 1;
+		height: 35px;
+
+		&--disabled {
+			background-color: #f5f7fa;
+			cursor: not-allowed;
+		}
+	}
+
+	.uni-select__label {
+		font-size: 16px;
+		// line-height: 22px;
+		height: 35px;
+		padding-right: 10px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__input-box {
+		height: 35px;
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-select__input {
+		flex: 1;
+		font-size: 14px;
+		height: 22px;
+		line-height: 22px;
+	}
+
+	.uni-select__input-plac {
+		font-size: 14px;
+		color: $uni-secondary-color;
+	}
+
+	.uni-select__selector {
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+		position: absolute;
+		top: calc(100% + 12px);
+		left: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		border: 1px solid #EBEEF5;
+		border-radius: 6px;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		z-index: 3;
+		padding: 4px 0;
+	}
+
+	.uni-select__selector-scroll {
+		/* #ifndef APP-NVUE */
+		max-height: 200px;
+		box-sizing: border-box;
+		/* #endif */
+	}
+
+	/* #ifdef H5 */
+	@media (min-width: 768px) {
+		.uni-select__selector-scroll {
+			max-height: 600px;
+		}
+	}
+	/* #endif */
+
+	.uni-select__selector-empty,
+	.uni-select__selector-item {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		line-height: 35px;
+		font-size: 14px;
+		text-align: center;
+		/* border-bottom: solid 1px $uni-border-3; */
+		padding: 0px 10px;
+	}
+
+	.uni-select__selector-item:hover {
+		background-color: #f9f9f9;
+	}
+
+	.uni-select__selector-empty:last-child,
+	.uni-select__selector-item:last-child {
+		/* #ifndef APP-NVUE */
+		border-bottom: none;
+		/* #endif */
+	}
+
+	.uni-select__selector__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	/* picker 弹出层通用的指示小三角 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border-color: transparent;
+		border-style: solid;
+		border-width: 6px;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-top-width: 0;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-top-width: 0;
+		border-bottom-color: #fff;
+	}
+
+	.uni-select__input-text {
+		// width: 280px;
+		width: 100%;
+		color: $uni-main-color;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		-o-text-overflow: ellipsis;
+		overflow: hidden;
+	}
+
+	.uni-select__input-placeholder {
+		color: $uni-base-color;
+		font-size: 12px;
+	}
+
+	.uni-select--mask {
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		z-index: 2;
+	}
+</style>

uni_modules/uni-data-select/package.json

@@ -0,0 +1,85 @@
+{
+  "id": "uni-data-select",
+  "displayName": "uni-data-select 下拉框选择器",
+  "version": "1.0.6",
+  "description": "通过数据驱动的下拉框选择器",
+  "keywords": [
+    "uni-ui",
+    "select",
+    "uni-data-select",
+    "下拉框",
+    "下拉选"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.1"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-load-more"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+        "QQ": "u",
+        "京东": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-data-select/readme.md

@@ -0,0 +1,8 @@
+## DataSelect 下拉框选择器
+> **组件名：uni-data-select**
+> 代码块： `uDataSelect`
+
+当选项过多时，使用下拉菜单展示并选择内容
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-data-select)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

uni_modules/uni-search-bar/changelog.md

@@ -0,0 +1,35 @@
+## 1.2.4（2023-05-09）
+- 修复 i18n 国际化不正确的 Bug
+## 1.2.3（2022-05-24）
+- 新增 readonly 属性，组件只读
+## 1.2.2（2022-05-06）
+- 修复  vue3 input 事件不生效的bug
+## 1.2.1（2022-05-06）
+- 修复 多余代码导致的bug
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-search-bar](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+## 1.1.2（2021-08-30）
+- 修复 value 属性与 modelValue 属性不兼容的Bug
+## 1.1.1（2021-08-24）
+- 新增 支持国际化
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.9（2021-05-12）
+- 新增 项目示例地址
+## 1.0.8（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.7（2021-04-15）
+- uni-ui 新增 uni-search-bar 的 focus 事件
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持双向绑定
+- 更改 input 事件的返回值，e={value:Number} --> e=value
+- 新增 支持图标插槽
+- 新增 支持 clear、blur 事件
+- 新增 支持 focus 属性
+- 去掉组件背景色

uni_modules/uni-search-bar/components/uni-search-bar/i18n/en.json

@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "cancel",
+	"uni-search-bar.placeholder": "Search enter content"
+}

uni_modules/uni-search-bar/components/uni-search-bar/i18n/index.js

@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}

uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hans.json

@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "请输入搜索内容"
+}

uni_modules/uni-search-bar/components/uni-search-bar/i18n/zh-Hant.json

@@ -0,0 +1,4 @@
+{
+	"uni-search-bar.cancel": "取消",
+	"uni-search-bar.placeholder": "請輸入搜索內容"
+}

uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.vue

@@ -0,0 +1,298 @@
+<template>
+	<view class="uni-searchbar">
+		<view :style="{borderRadius:radius+'px',backgroundColor: bgColor}" class="uni-searchbar__box"
+			@click="searchClick">
+			<view class="uni-searchbar__box-icon-search">
+				<slot name="searchIcon">
+					<uni-icons color="#c0c4cc" size="18" type="search" />
+				</slot>
+			</view>
+			<input v-if="show || searchVal" :focus="showSync" :disabled="readonly" :placeholder="placeholderText" :maxlength="maxlength"
+				class="uni-searchbar__box-search-input" confirm-type="search" type="text" v-model="searchVal"
+				@confirm="confirm" @blur="blur" @focus="emitFocus" />
+			<text v-else class="uni-searchbar__text-placeholder">{{ placeholder }}</text>
+			<view v-if="show && (clearButton==='always'||clearButton==='auto'&&searchVal!=='') &&!readonly"
+				class="uni-searchbar__box-icon-clear" @click="clear">
+				<slot name="clearIcon">
+					<uni-icons color="#c0c4cc" size="20" type="clear" />
+				</slot>
+			</view>
+		</view>
+		<text @click="cancel" class="uni-searchbar__cancel"
+			v-if="cancelButton ==='always' || show && cancelButton ==='auto'">{{cancelTextI18n}}</text>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+
+	/**
+	 * SearchBar 搜索栏
+	 * @description 搜索栏组件，通常用于搜索商品、文章等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=866
+	 * @property {Number} radius 搜索栏圆角
+	 * @property {Number} maxlength 输入最大长度
+	 * @property {String} placeholder 搜索栏Placeholder
+	 * @property {String} clearButton = [always|auto|none] 是否显示清除按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelButton = [always|auto|none] 是否显示取消按钮
+	 * 	@value always 一直显示
+	 * 	@value auto 输入框不为空时显示
+	 * 	@value none 一直不显示
+	 * @property {String} cancelText 取消按钮的文字
+	 * @property {String} bgColor 输入框背景颜色
+	 * @property {Boolean} focus 是否自动聚焦
+	 * @property {Boolean} readonly 组件只读，不能有任何操作，只做展示
+	 * @event {Function} confirm uniSearchBar 的输入框 confirm 事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} input uniSearchBar 的 value 改变时触发事件，返回参数为uniSearchBar的value，e=value
+	 * @event {Function} cancel 点击取消按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} clear 点击清除按钮时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 * @event {Function} blur input失去焦点时触发事件，返回参数为uniSearchBar的value，e={value:Number}
+	 */
+
+	export default {
+		name: "UniSearchBar",
+		emits: ['input', 'update:modelValue', 'clear', 'cancel', 'confirm', 'blur', 'focus'],
+		props: {
+			placeholder: {
+				type: String,
+				default: ""
+			},
+			radius: {
+				type: [Number, String],
+				default: 5
+			},
+			clearButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelButton: {
+				type: String,
+				default: "auto"
+			},
+			cancelText: {
+				type: String,
+				default: ""
+			},
+			bgColor: {
+				type: String,
+				default: "#F8F8F8"
+			},
+			maxlength: {
+				type: [Number, String],
+				default: 100
+			},
+			value: {
+				type: [Number, String],
+				default: ""
+			},
+			modelValue: {
+				type: [Number, String],
+				default: ""
+			},
+			focus: {
+				type: Boolean,
+				default: false
+			},
+			readonly: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				show: false,
+				showSync: false,
+				searchVal: ''
+			}
+		},
+		computed: {
+			cancelTextI18n() {
+				return this.cancelText || t("uni-search-bar.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-search-bar.placeholder")
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					this.searchVal = newVal
+					if (newVal) {
+						this.show = true
+					}
+				}
+			},
+			// #endif
+			focus: {
+				immediate: true,
+				handler(newVal) {
+					if (newVal) {
+						if(this.readonly) return
+						this.show = true;
+						this.$nextTick(() => {
+							this.showSync = true
+						})
+					}
+				}
+			},
+			searchVal(newVal, oldVal) {
+				this.$emit("input", newVal)
+				// #ifdef VUE3
+				this.$emit("update:modelValue", newVal)
+				// #endif
+			}
+		},
+		methods: {
+			searchClick() {
+				if(this.readonly) return
+				if (this.show) {
+					return
+				}
+				this.show = true;
+				this.$nextTick(() => {
+					this.showSync = true
+				})
+			},
+			clear() {
+				this.$emit("clear", {
+					value: this.searchVal
+				})
+				this.searchVal = ""
+			},
+			cancel() {
+				if(this.readonly) return
+				this.$emit("cancel", {
+					value: this.searchVal
+				});
+				this.searchVal = ""
+				this.show = false
+				this.showSync = false
+				// #ifndef APP-PLUS
+				uni.hideKeyboard()
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+			},
+			confirm() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("confirm", {
+					value: this.searchVal
+				})
+			},
+			blur() {
+				// #ifndef APP-PLUS
+				uni.hideKeyboard();
+				// #endif
+				// #ifdef APP-PLUS
+				plus.key.hideSoftKeybord()
+				// #endif
+				this.$emit("blur", {
+					value: this.searchVal
+				})
+			},
+			emitFocus(e) {
+				this.$emit("focus", e.detail)
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$uni-searchbar-height: 36px;
+
+	.uni-searchbar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		position: relative;
+		padding: 10px;
+		// background-color: #fff;
+	}
+
+	.uni-searchbar__box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		overflow: hidden;
+		position: relative;
+		flex: 1;
+		justify-content: center;
+		flex-direction: row;
+		align-items: center;
+		height: $uni-searchbar-height;
+		padding: 5px 8px 5px 0px;
+	}
+
+	.uni-searchbar__box-icon-search {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 32px;
+		padding: 0 8px;
+		justify-content: center;
+		align-items: center;
+		color: #B3B3B3;
+	}
+
+	.uni-searchbar__box-search-input {
+		flex: 1;
+		font-size: 14px;
+		color: #333;
+	}
+
+	.uni-searchbar__box-icon-clear {
+		align-items: center;
+		line-height: 24px;
+		padding-left: 8px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-searchbar__text-placeholder {
+		font-size: 14px;
+		color: #B3B3B3;
+		margin-left: 5px;
+	}
+
+	.uni-searchbar__cancel {
+		padding-left: 10px;
+		line-height: $uni-searchbar-height;
+		font-size: 14px;
+		color: #333333;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+</style>

uni_modules/uni-search-bar/package.json

@@ -0,0 +1,86 @@
+{
+  "id": "uni-search-bar",
+  "displayName": "uni-search-bar 搜索栏",
+  "version": "1.2.4",
+  "description": "搜索栏组件，通常用于搜索商品、文章等",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "搜索框",
+    "搜索栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-search-bar/readme.md

@@ -0,0 +1,14 @@
+
+
+## SearchBar 搜索栏
+
+> **组件名：uni-search-bar**
+> 代码块： `uSearchBar`
+
+
+搜索栏组件
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-search-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+

uni_modules/uni-section/changelog.md

@@ -0,0 +1,2 @@
+## 0.0.1（2022-07-22）
+- 初始化

uni_modules/uni-section/components/uni-section/uni-section.vue

@@ -0,0 +1,167 @@
+<template>
+	<view class="uni-section">
+		<view class="uni-section-header" @click="onClick">
+				<view class="uni-section-header__decoration" v-if="type" :class="type" />
+        <slot v-else name="decoration"></slot>
+
+        <view class="uni-section-header__content">
+          <text :style="{'font-size':titleFontSize,'color':titleColor}" class="uni-section__content-title" :class="{'distraction':!subTitle}">{{ title }}</text>
+          <text v-if="subTitle" :style="{'font-size':subTitleFontSize,'color':subTitleColor}" class="uni-section-header__content-sub">{{ subTitle }}</text>
+        </view>
+
+        <view class="uni-section-header__slot-right">
+          <slot name="right"></slot>
+        </view>
+		</view>
+
+		<view class="uni-section-content" :style="{padding: _padding}">
+			<slot />
+		</view>
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Section 标题栏
+	 * @description 标题栏
+	 * @property {String} type = [line|circle|square] 标题装饰类型
+	 * 	@value line 竖线
+	 * 	@value circle 圆形
+	 * 	@value square 正方形
+	 * @property {String} title 主标题
+	 * @property {String} titleFontSize 主标题字体大小
+	 * @property {String} titleColor 主标题字体颜色
+	 * @property {String} subTitle 副标题
+	 * @property {String} subTitleFontSize 副标题字体大小
+	 * @property {String} subTitleColor 副标题字体颜色
+	 * @property {String} padding 默认插槽 padding
+	 */
+
+	export default {
+		name: 'UniSection',
+    emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				required: true,
+				default: ''
+			},
+      titleFontSize: {
+        type: String,
+        default: '14px'
+      },
+			titleColor:{
+				type: String,
+				default: '#333'
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			},
+      subTitleFontSize: {
+        type: String,
+        default: '12px'
+      },
+      subTitleColor: {
+        type: String,
+        default: '#999'
+      },
+			padding: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+    computed:{
+      _padding(){
+        if(typeof this.padding === 'string'){
+          return this.padding
+        }
+
+        return this.padding?'10px':''
+      }
+    },
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+    methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	$uni-primary: #2979ff !default;
+
+	.uni-section {
+		background-color: #fff;
+    .uni-section-header {
+      position: relative;
+      /* #ifndef APP-NVUE */
+      display: flex;
+      /* #endif */
+      flex-direction: row;
+      align-items: center;
+      padding: 12px 10px;
+      font-weight: normal;
+
+      &__decoration{
+        margin-right: 6px;
+        background-color: $uni-primary;
+        &.line {
+          width: 4px;
+          height: 12px;
+          border-radius: 10px;
+        }
+
+        &.circle {
+          width: 8px;
+          height: 8px;
+          border-top-right-radius: 50px;
+          border-top-left-radius: 50px;
+          border-bottom-left-radius: 50px;
+          border-bottom-right-radius: 50px;
+        }
+
+        &.square {
+          width: 8px;
+          height: 8px;
+        }
+      }
+
+      &__content {
+        /* #ifndef APP-NVUE */
+        display: flex;
+        /* #endif */
+        flex-direction: column;
+        flex: 1;
+        color: #333;
+
+        .distraction {
+          flex-direction: row;
+          align-items: center;
+        }
+        &-sub {
+          margin-top: 2px;
+        }
+      }
+
+      &__slot-right{
+        font-size: 14px;
+      }
+    }
+
+    .uni-section-content{
+      font-size: 14px;
+    }
+	}
+</style>

uni_modules/uni-section/package.json

@@ -0,0 +1,87 @@
+{
+  "id": "uni-section",
+  "displayName": "uni-section 标题栏",
+  "version": "0.0.1",
+  "description": "标题栏组件",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "标题栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}

uni_modules/uni-section/readme.md

@@ -0,0 +1,8 @@
+## Section 标题栏
+> **组件名：uni-section**
+> 代码块： `uSection`
+
+uni-section 组件主要用于文章、列表详情等标题展示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839