修复bug

pages.json

@@ -34,6 +34,12 @@
 				"navigationBarTitleText": ""
 			}
 		},
+		{
+			"path": "pages/index/article",
+			"style": {
+				"navigationBarTitleText": ""
+			}
+		},
 		// {
 		// 	"path": "pages/doctor_related/select_doctor",
 		// 	"style": {
@@ -357,8 +363,8 @@
 				{
 					"path": "my_consulting/my_consulting",
 					"style": {
-						"navigationBarTitleText": "我的咨询"
-						
+						"navigationBarTitleText": "我的咨询",
+						"enablePullDownRefresh":true
 					}
 				},
 				{

pages/common_tools/my_consulting/consultingInfo.vue

@@ -61,7 +61,7 @@
 				<view class="cu-tabbar-height"></view>
 				<view class="cu-bar bg-white tabbar" v-if="orderInfo.order_status==4&&orderInfo.product_type==2" style="position: fixed;bottom: 0;width: 100%;display: flex;justify-content: flex-end;height: 108rpx;">
 					<u-button shape="circle" :custom-style="customStyle" @click="gotochat" :ripple="true">咨询会话</u-button>
-					<u-button shape="circle" :custom-style="customStyle" @click="gotopinjia" :ripple="true">查看评价</u-button>
+					<!-- <u-button shape="circle" :custom-style="customStyle" @click="gotopinjia" :ripple="true">查看评价</u-button> -->
 					<u-button shape="circle" :custom-style="customStylebtn" @click="gosuggest" :ripple="true">意见单</u-button>
 				</view>
 				<view class="cu-bar bg-white tabbar" v-else-if="orderInfo.order_status==3" style="position: fixed;bottom: 0;width: 100%;">

pages/common_tools/my_consulting/my_consulting.vue

@@ -1,576 +1,579 @@
-<template>
-	<view class="main bg-white">
-		<u-dropdown>
-			<u-dropdown-item v-model="value1" :title="options1[value1].label" @change="typechange" :options="options1"></u-dropdown-item>
-			<u-dropdown-item v-model="value2" :title="options2[value2].label" @change="paychange" :options="options2"></u-dropdown-item>
-			<u-dropdown-item v-model="value3" :title="options3[value3].label" @change="timechange" :options="options3"></u-dropdown-item>
-		</u-dropdown>
-		<load-refresh ref="loadRefresh" :isRefresh="true" :isPaging="false" refreshType="loader" refreshTime="2000"
-		 heightReduce="10" backgroundCover="#fff" :pageNo="pageindex" :totalPageNo="totalPage" @loadMore="loadMore" @refresh="refresh">
-			<view slot="content-list">
-				<view class="margin-top-sm margin-lr-sm padding-lr-xs" v-for="(item,index) in ordersList" @click="goinfoorder"
-				 :data-id="item.id" :key="index" style="border-radius: 16rpx;box-shadow:0px 0px 10px rgba(0,0,0,.2);">
-					<view class="flex justify-between align-center bg-white" style="padding: 28rpx;border-radius: 16rpx;">
-						<view class="jinxing">
-							<text style="display: inline-block;width: 12rpx;height: 12rpx;border-radius: 50%;background-color:#EEAA3F;margin-right: 8rpx;"></text>
-							<text v-if="item.order_status==3">进行中</text>
-							<text v-else-if="item.order_status==1">未支付</text>
-							<text v-else-if="item.order_status==2">待接单</text>
-							<text v-else-if="item.order_status==4">已完成</text>
-							<text v-else-if="item.order_status==5">已取消</text>
-							<text v-else-if="item.order_status==6">已超时</text>
-						</view>
-						<text class="phonezi" v-if="item.product_type==1">电话咨询</text>
-						<text class="phonezi" v-else-if="item.product_type==2">图文咨询</text>
-					</view>
-					<view class="" style="background: #FBFBFB;padding: 28rpx; border-radius: 16rpx;">
-						<view class="nametaile flex align-center">
-							<u-avatar :src="item.docter.avatar" mode="circle"></u-avatar>
-							<text class="margin-left-sm">{{item.docter.name}}</text>
-							<text class="text_style" v-for="(itm,idx) in item.docter.label_texts" :key="index">{{itm.label_name}}</text>
-						</view>
-						<view class="textstyle margin-top-xs flex align-center justify-between">
-							<text style="color: #333333;">科室：{{item.docter.office.name||'暂无'}} {{item.docter.qualification.name||'暂无'}}</text>
-							<text v-if="item.order_status==4&&item.product_type==2" class="text-blue" @click.stop="gosuggest(item)">意见单</text>
-							<text v-else-if="item.order_status==1" @click.stop="payorder(item.id,item.payment_amount,item.product_type)"
-							 class="text-blue">去支付</text>
-							<text v-else class="text-blue">查看详情</text>
-						</view>
-						<view class="textstyle margin-top-xs flex align-center justify-between">
-							<text style="color: #333333;">编号：{{item.order_sn}}</text>
-							<text v-if="item.order_status==4&&item.is_evaluate!=1" @click.stop="evaluate(item,index)" style="width: 130rpx; text-align: right;"
-							 class="text-blue">评价</text>
-							<!-- <text v-else-if="item.order_status==1" class="text-blue">取消</text> -->
-							<text v-else-if="item.order_status==4&&item.is_evaluate==1" class="text-blue" @click.stop="gotoeva">查看评价</text>
-						</view>
-						<view class="textstyle margin-top-xs">
-							<text style="color: #333333;">下单时间：{{item.created_at}}</text>
-						</view>
-					</view>
-					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2" style="width: 100%;display: flex;justify-content: flex-end;">
-						<u-button shape="circle" size="mini" @click="cancelOrder(item,index)" :ripple="true">取消订单</u-button>
-					</view>
-				</view>
-				<u-empty text="暂无数据" mode="order" :show="show" margin-top="250"></u-empty>
-			</view>
-		</load-refresh>
-		<!-- <view class="margin-lr-sm bg-white">
-			<view class="margin-top-sm" v-for="(item,index) in ordersList" @click="goinfoorder" :data-id="item.id" :key="index"
-			 style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
-				<view class="flex justify-between align-center bg-white" style="padding: 28rpx;border-radius: 16rpx;">
-					<view class="jinxing">
-						<text style="display: inline-block;width: 12rpx;height: 12rpx;border-radius: 50%;background-color:#EEAA3F;margin-right: 8rpx;"></text>
-						<text v-if="item.order_status==3">进行中</text>
-						<text v-else-if="item.order_status==1">未支付</text>
-						<text v-else-if="item.order_status==2">待接单</text>
-						<text v-else-if="item.order_status==4">已完成</text>
-						<text v-else>已取消</text>
-					</view>
-					<text class="phonezi" v-if="item.product_type==1">电话咨询</text>
-					<text class="phonezi" v-else-if="item.product_type==2">图文咨询</text>
-				</view>
-				<view class="" style="background: #FBFBFB;padding: 28rpx; border-radius: 16rpx;">
-					<view class="nametaile flex align-center">
-						<u-avatar :src="item.docter.avatar" mode="circle"></u-avatar>
-						<text class="margin-left-sm">{{item.docter.name}}</text>
-						<text class="text_style" v-for="(itm,idx) in item.docter.label_texts" :key="index">{{itm.label_name}}</text>
-					</view>
-					<view class="textstyle margin-top-xs flex align-center justify-between">
-						<text style="color: #333333;">科室：{{item.docter.office.name||'暂无'}} {{item.docter.qualification.name||'暂无'}}</text>
-						<text v-if="item.order_status==4&&item.product_type==2" class="text-blue" @click.stop="gosuggest(item)">意见单</text>
-						<text v-else-if="item.order_status==1" class="text-blue">去支付</text>
-						<text v-else class="text-blue">查看详情</text>
-					</view>
-					<view class="textstyle margin-top-xs flex align-center justify-between">
-						<text style="color: #333333;">编号：{{item.order_sn}}</text>
-						<text v-if="item.order_status==4&&item.is_evaluate!=1" @click.stop="evaluate(item,index)" style="width: 130rpx; text-align: right;"
-						 class="text-blue">评价</text>
-						<text v-else-if="item.order_status==1" class="text-blue">取消</text>
-						<text v-else-if="item.order_status==4&&item.is_evaluate==1" class="text-blue" @click.stop="gotoeva">查看评价</text>
-					</view>
-					<view class="textstyle margin-top-xs">
-						<text style="color: #333333;">下单时间：{{item.created_at}}</text>
-					</view>
-				</view>
-			</view>
-		</view> -->
-		<u-popup v-model="showpinjia" mode="center" border-radius="14">
-			<view class="padding-xl flex flex-direction align-center">
-				<view class="text-xl text-bold text-black text-center">
-					填写评价
-				</view>
-				<view class="margin-tb-sm">
-					<u-rate :count="count" size="48" active-color="#EEAA3F" v-model="ratevalue"></u-rate>
-				</view>
-				<textarea v-model="content" class="textareastyle"></textarea>
-				<view class="flex align-center justify-between margin-tb" style="width: 100%;">
-					<button class="cancel" @click="concelpop">取消</button>
-					<button class="determine" @click="determinepop">确定</button>
-				</view>
-			</view>
-		</u-popup>
-		<!-- <view class="cu-tabbar-height"></view>
-		<view class="cu-tabbar-height"></view> -->
-		<u-keyboard default="" ref="uKeyboard" mode="number" :mask="true" :mask-close-able="false" :dot-enabled="false"
-		 v-model="showpay" :safe-area-inset-bottom="true" :tooltip="false" @change="onChange" @backspace="onBackspace">
-			<view>
-				<view class="u-text-center u-padding-20 money">
-					<text>{{payment_amount/100}}</text>
-					<text class="u-font-20 u-padding-left-10">元</text>
-					<view class="u-padding-10 close" data-flag="false" @tap="showPop(false)">
-						<u-icon name="close" color="#333333" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="u-flex u-row-center">
-					<u-message-input mode="box" :maxlength="6" :dot-fill="true" v-model="password" :disabled-keyboard="true" @finish="finish"></u-message-input>
-				</view>
-				<view class="u-text-center u-padding-top-10 u-padding-bottom-20 tips">请输入密码</view>
-			</view>
+<template>
+	<view class="main bg-white">
+		<u-dropdown>
+			<u-dropdown-item v-model="value1" :title="options1[value1].label" @change="typechange" :options="options1"></u-dropdown-item>
+			<u-dropdown-item v-model="value2" :title="options2[value2].label" @change="paychange" :options="options2"></u-dropdown-item>
+			<u-dropdown-item v-model="value3" :title="options3[value3].label" @change="timechange" :options="options3"></u-dropdown-item>
+		</u-dropdown>
+		<!-- <load-refresh ref="loadRefresh" :isRefresh="true" :isPaging="false" refreshType="loader" refreshTime="2000"
+		 heightReduce="10" backgroundCover="#fff" :pageNo="pageindex" :totalPageNo="totalPage" @loadMore="loadMore" @refresh="refresh">
+			<view slot="content-list">
+				<view class="margin-top-sm margin-lr-sm padding-lr-xs" v-for="(item,index) in ordersList" @click="goinfoorder"
+				 :data-id="item.id" :key="index" style="border-radius: 16rpx;box-shadow:0px 0px 10px rgba(0,0,0,.2);">
+					<view class="flex justify-between align-center bg-white" style="padding: 28rpx;border-radius: 16rpx;">
+						<view class="jinxing">
+							<text style="display: inline-block;width: 12rpx;height: 12rpx;border-radius: 50%;background-color:#EEAA3F;margin-right: 8rpx;"></text>
+							<text v-if="item.order_status==3">进行中</text>
+							<text v-else-if="item.order_status==1">未支付</text>
+							<text v-else-if="item.order_status==2">待接单</text>
+							<text v-else-if="item.order_status==4">已完成</text>
+							<text v-else-if="item.order_status==5">已取消</text>
+							<text v-else-if="item.order_status==6">已超时</text>
+						</view>
+						<text class="phonezi" v-if="item.product_type==1">电话咨询</text>
+						<text class="phonezi" v-else-if="item.product_type==2">图文咨询</text>
+					</view>
+					<view class="" style="background: #FBFBFB;padding: 28rpx; border-radius: 16rpx;">
+						<view class="nametaile flex align-center">
+							<u-avatar :src="item.docter.avatar" mode="circle"></u-avatar>
+							<text class="margin-left-sm">{{item.docter.name}}</text>
+							<text class="text_style" v-for="(itm,idx) in item.docter.label_texts" :key="index">{{itm.label_name}}</text>
+						</view>
+						<view class="textstyle margin-top-xs flex align-center justify-between">
+							<text style="color: #333333;">科室：{{item.docter.office.name||'暂无'}} {{item.docter.qualification.name||'暂无'}}</text>
+							<text v-if="item.order_status==4&&item.product_type==2" class="text-blue" @click.stop="gosuggest(item)">意见单</text>
+							<text v-else-if="item.order_status==1" @click.stop="payorder(item.id,item.payment_amount,item.product_type)"
+							 class="text-blue">去支付</text>
+							<text v-else class="text-blue">查看详情</text>
+						</view>
+						<view class="textstyle margin-top-xs flex align-center justify-between">
+							<text style="color: #333333;">编号：{{item.order_sn}}</text>
+							<text v-if="item.order_status==4&&item.is_evaluate!=1" @click.stop="evaluate(item,index)" style="width: 130rpx; text-align: right;"
+							 class="text-blue">评价</text>
+							<text v-else-if="item.order_status==1" class="text-blue">取消</text>
+							<text v-else-if="item.order_status==4&&item.is_evaluate==1" class="text-blue" @click.stop="gotoeva">查看评价</text>
+						</view>
+						<view class="textstyle margin-top-xs">
+							<text style="color: #333333;">下单时间：{{item.created_at}}</text>
+						</view>
+					</view>
+					<view class="cu-bar bg-white tabbar" v-if="item.order_status==1||item.order_status==2" style="width: 100%;display: flex;justify-content: flex-end;">
+						<u-button shape="circle" size="mini" @click="cancelOrder(item,index)" :ripple="true">取消订单</u-button>
+					</view>
+				</view>
+				<u-empty text="暂无数据" mode="order" :show="show" margin-top="250"></u-empty>
+			</view>
+		</load-refresh> -->
+		<view class="margin-lr-sm bg-white">
+			<view class="margin-top-sm" v-for="(item,index) in ordersList" @click="goinfoorder" :data-id="item.id" :key="index"
+			 style="border-radius: 16rpx;box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);">
+				<view class="flex justify-between align-center bg-white" style="padding: 28rpx;border-radius: 16rpx;">
+					<view class="jinxing">
+						<text style="display: inline-block;width: 12rpx;height: 12rpx;border-radius: 50%;background-color:#EEAA3F;margin-right: 8rpx;"></text>
+						<text v-if="item.order_status==3">进行中</text>
+						<text v-else-if="item.order_status==1">未支付</text>
+						<text v-else-if="item.order_status==2">待接单</text>
+						<text v-else-if="item.order_status==4">已完成</text>
+						<text v-else-if="item.order_status==5">已取消</text>
+						<text v-else-if="item.order_status==6">已超时</text>
+					</view>
+					<text class="phonezi" v-if="item.product_type==1">电话咨询</text>
+					<text class="phonezi" v-else-if="item.product_type==2">图文咨询</text>
+				</view>
+				<view class="" style="background: #FBFBFB;padding: 28rpx; border-radius: 16rpx;">
+					<view class="nametaile flex align-center">
+						<u-avatar :src="item.docter.avatar" mode="circle"></u-avatar>
+						<text class="margin-left-sm">{{item.docter.name}}</text>
+						<text class="text_style" v-for="(itm,idx) in item.docter.label_texts" :key="index">{{itm.label_name}}</text>
+					</view>
+					<view class="textstyle margin-top-xs flex align-center justify-between">
+						<text style="color: #333333;">科室：{{item.docter.office.name||'暂无'}} {{item.docter.qualification.name||'暂无'}}</text>
+						<text v-if="item.order_status==4&&item.product_type==2" class="text-blue" @click.stop="gosuggest(item)">意见单</text>
+						<text v-else-if="item.order_status==1" @click.stop="payorder(item.id,item.payment_amount,item.product_type)"
+						 class="text-blue">去支付</text>
+						<text v-else class="text-blue">查看详情</text>
+					</view>
+					<view class="textstyle margin-top-xs flex align-center justify-between">
+						<text style="color: #333333;">编号：{{item.order_sn}}</text>
+						<text v-if="item.order_status==4&&item.is_evaluate!=1" @click.stop="evaluate(item,index)" style="width: 130rpx; text-align: right;"
+						 class="text-blue">评价</text>
+						<!-- <text v-else-if="item.order_status==1" class="text-blue">取消</text> -->
+						<!-- <text v-else-if="item.order_status==4&&item.is_evaluate==1" class="text-blue" @click.stop="gotoeva">查看评价</text> -->
+					</view>
+					<view class="textstyle margin-top-xs">
+						<text style="color: #333333;">下单时间：{{item.created_at}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<u-popup v-model="showpinjia" mode="center" border-radius="14">
+			<view class="padding-xl flex flex-direction align-center">
+				<view class="text-xl text-bold text-black text-center">
+					填写评价
+				</view>
+				<view class="margin-tb-sm">
+					<u-rate :count="count" size="48" active-color="#EEAA3F" v-model="ratevalue"></u-rate>
+				</view>
+				<textarea v-model="content" class="textareastyle"></textarea>
+				<view class="flex align-center justify-between margin-tb" style="width: 100%;">
+					<button class="cancel" @click="concelpop">取消</button>
+					<button class="determine" @click="determinepop">确定</button>
+				</view>
+			</view>
+		</u-popup>
+		<!-- <view class="cu-tabbar-height"></view>
+		<view class="cu-tabbar-height"></view> -->
+		<u-keyboard default="" ref="uKeyboard" mode="number" :mask="true" :mask-close-able="false" :dot-enabled="false"
+		 v-model="showpay" :safe-area-inset-bottom="true" :tooltip="false" @change="onChange" @backspace="onBackspace">
+			<view>
+				<view class="u-text-center u-padding-20 money">
+					<text>{{payment_amount/100}}</text>
+					<text class="u-font-20 u-padding-left-10">元</text>
+					<view class="u-padding-10 close" data-flag="false" @tap="showPop(false)">
+						<u-icon name="close" color="#333333" size="28"></u-icon>
+					</view>
+				</view>
+				<view class="u-flex u-row-center">
+					<u-message-input mode="box" :maxlength="6" :dot-fill="true" v-model="password" :disabled-keyboard="true" @finish="finish"></u-message-input>
+				</view>
+				<view class="u-text-center u-padding-top-10 u-padding-bottom-20 tips">请输入密码</view>
+			</view>
 		</u-keyboard>
-	</view>
-</template>
-
-<script>
-	import loadRefresh from '@/components/load-refresh/load-refresh'
-	import IMService from "../../../common/goeasyimutil.js"
-	export default {
-		components: {
-			loadRefresh
-		},
-		onLoad(options) {
-
-		},
-		onShow() {
-			console.log(uni.getStorageSync('user').flag, typeof uni.getStorageSync('user').flag)
-			if (getApp().globalData.imService == null) {
-				let user = uni.getStorageSync('user')
-				getApp().globalData.imService = new IMService();
-				let loginResult = getApp().globalData.imService.login({
-					flag: user.flag,
-					nickname: user.nickname,
-					avatar: user.avatar
-				});
-				if (loginResult) {
-					//连接IM
-					getApp().globalData.imService.connectIM();
-				}
-			}
-			this.ordersList = []
-			this.pageindex = 1
-			this.getordersList()
-		},
-		mounted() {
-
-		},
-		data() {
-			return {
-				value1: 0, //全部类型
-				value2: 0, //全部状态
-				value3: 1, //时间正序
-				options1: [{
-						value: 0,
-						label: "全部类型"
-					},
-					{
-						value: 1,
-						label: "电话咨询"
-					},
-					{
-						value: 2,
-						label: "图文咨询"
-					},
-				],
-				options2: [{
-						value: 0,
-						label: "全部状态"
-					},
-					{
-						value: 1,
-						label: "未支付"
-					},
-					{
-						value: 2,
-						label: "待接单"
-					},
-					{
-						value: 3,
-						label: "进行中"
-					},
-					{
-						value: 4,
-						label: "已完成"
-					},
-					{
-						value: 5,
-						label: "已取消"
-					},
-				],
-				options3: [{
-						value: 0,
-						label: "时间正序"
-					},
-					{
-						value: 1,
-						label: "时间倒序"
-					},
-				],
-				ordersList: [],
-				pageindex: 1,
-				show: false,
-				showpinjia: false,
-				ratevalue: "",
-				count: 5,
-				content: "",
-				currentorder: "",
-				evaluateindex: "",
-				totalPage: "",
-				showpay: false,
-				payment_amount: "",
-				password: "",
-				payid: "",
-				paytype: ""
-			}
-		},
-		// onReachBottom() {
-		// 	this.getordersList()
-		// },
-		// onPullDownRefresh() {
-		// 	this.pageindex = 1
-		// 	this.ordersList = []
-		// 	this.getordersList()
-		// 	uni.stopPullDownRefresh()
-		// },
-		methods: {
-			payorder(id, price, type) {
-				this.showpay = true
-				this.payment_amount = price
-				this.payid = id
-				this.paytype = type
-			},
-			showPop(flag = true) {
-				this.password = '';
-				this.showpay = flag;
-			},
-			onChange(val) {
-				if (this.password.length < 6) {
-					this.password += val;
-				}
-
-				if (this.password.length >= 6) {
-					this.paymoney()
-					return false
-				}
-			},
-			paymoney: async function() {
-				uni.showLoading({
-					title: '支付中'
-				})
-				let res = await this.$request.post("/api/v1/order/orderPay", {
-					order_id: this.payid,
-					pay_password: this.password
-				})
-				if (res.status == 0) {
-					uni.hideLoading();
-					this.showpay = false;
-					this.password = ""
-					uni.showToast({
-						icon: 'success',
-						title: '支付成功',
-						duration: 1000
-					})
-					setTimeout(() => {
-						uni.navigateTo({
-							url: "../../order/order?type=" + this.paytype
-						})
-					}, 1000)
-				} else {
-					uni.hideLoading();
-					this.password = ""
-					uni.showModal({
-						title: "提示",
-						content: res.message,
-						confirmText: "确定",
-						showCancel: false,
-						success: (rr) => {
-							if (rr.confirm) {
-								this.showpay = false;
-							}
-						}
-					})
-				}
-			},
-			onBackspace(e) {
-				if (this.password.length > 0) {
-					this.password = this.password.substring(0, this.password.length - 1);
-				}
-			},
-			cancelOrder: async function(item, index) {
-				uni.showModal({
-					title: "提示",
-					content: "确定要取消订单吗？",
-					success: (res) => {
-						if (res.confirm) {
-							uni.requestSubscribeMessage({
-								tmplIds: ['368_VJaSVZQay3E5-yPelJKJn3R_Hu56dVflxazHiCY'],
-								success: (res) => {
-									this.confirmorder(item, index)
-								},
-								fail: (err) => {
-									this.confirmorder(item, index)
-								}
-							})
-						}
-					}
-				})
-			},
-			confirmorder: async function(item, index) {
-				let res = await this.$request.post("/api/v1/order/orderCancel", {
-					order_id: item.id
-				})
-				if (res.status == 0) {
-					uni.showToast({
-						title: "取消成功",
-						icon: "none"
-					})
-					this.ordersList.splice(index, 1)
-				} else {
-					uni.showModal({
-						title: "提示",
-						content: res.message,
-						showCancel: false,
-						success: (res) => {}
-					})
-				}
-			},
-			loadMore() {
-				this.getordersList()
-			},
-			refresh() {
-				this.pageindex = 1
-				this.ordersList = []
-				this.getordersList()
-			},
-			evaluate(item, index) {
-				this.showpinjia = true
-				this.currentorder = item
-				this.evaluateindex = index
-			},
-			determinepop: async function() {
-				let res = await this.$request.post("/api/v1/evaluate/sumbitEvaluate", {
-					order_id: this.currentorder.id,
-					docter_id: this.currentorder.docter_id,
-					score: this.ratevalue,
-					content: this.content
-				})
-				console.log(res)
-				if (res.status == 0) {
-					uni.showToast({
-						title: "评价成功",
-						icon: "none",
-						duration: 500
-					})
-					this.ordersList[this.evaluateindex].is_evaluate = 1
-					setTimeout(() => {
-						this.showpinjia = false
-					}, 500)
-					this.$forceUpdate()
-				}
-			},
-			concelpop() {
-				this.content = ""
-				this.showpinjia = false
-			},
-			typechange(value) {
-				this.value1 = value
-				this.pageindex = 1
-				this.ordersList = []
-				this.getordersList()
-			},
-			paychange(value) {
-				this.value2 = value
-				this.pageindex = 1
-				this.ordersList = []
-				this.getordersList()
-			},
-			timechange(value) {
-				this.value3 = value
-				this.pageindex = 1
-				this.ordersList = []
-				this.getordersList()
-			},
-			getordersList: async function() {
-				let res = await this.$request.post("/api/v1/order/orderList", {
-					page: this.pageindex,
-					list_type: this.value1,
-					product_type: this.value1,
-					order_status: this.value2,
-					time_sort: this.value3
-				}, false)
-				if (res.status == 0) {
-					this.$refs.loadRefresh.loadOver()
-					if (this.pageindex > res.data.last_page) {
-						uni.showToast({
-							title: "没有更多了",
-							icon: "none"
-						})
-					} else {
-						this.ordersList = this.ordersList.concat(res.data.data)
-						this.ordersList.forEach((item, index) => {
-							if (item.docter == null) {
-								this.ordersList.splice(index, 1)
-							}
-						})
-						this.ordersList.forEach((item, index) => {
-							if (item.product_type == 6) {
-								this.ordersList.splice(index, 1)
-							}
-						})
-						this.ordersList.forEach((item, index) => {
-							if (item.product_type == 5) {
-								this.ordersList.splice(index, 1)
-							}
-						})
-						this.ordersList.forEach((item, index) => {
-							if (item.product_type != 1 && item.product_type != 2) {
-								this.ordersList.splice(index, 1)
-							}
-						})
-						this.ordersList.forEach((item, index) => {
-							if (item.product_type == 3) {
-								this.ordersList.splice(index, 1)
-							}
-						})
-						console.log(this.ordersList)
+		<view class="cu-tabbar-height"></view>
+	</view>
+</template>
+
+<script>
+	import loadRefresh from '@/components/load-refresh/load-refresh'
+	import IMService from "../../../common/goeasyimutil.js"
+	export default {
+		components: {
+			loadRefresh
+		},
+		onLoad(options) {
+
+		},
+		onShow() {
+			console.log(uni.getStorageSync('user').flag, typeof uni.getStorageSync('user').flag)
+			if (getApp().globalData.imService == null) {
+				let user = uni.getStorageSync('user')
+				getApp().globalData.imService = new IMService();
+				let loginResult = getApp().globalData.imService.login({
+					flag: user.flag,
+					nickname: user.nickname,
+					avatar: user.avatar
+				});
+				if (loginResult) {
+					//连接IM
+					getApp().globalData.imService.connectIM();
+				}
+			}
+			this.ordersList = []
+			this.pageindex = 1
+			this.getordersList()
+		},
+		mounted() {
+
+		},
+		data() {
+			return {
+				value1: 0, //全部类型
+				value2: 0, //全部状态
+				value3: 1, //时间正序
+				options1: [{
+						value: 0,
+						label: "全部类型"
+					},
+					{
+						value: 1,
+						label: "电话咨询"
+					},
+					{
+						value: 2,
+						label: "图文咨询"
+					},
+				],
+				options2: [{
+						value: 0,
+						label: "全部状态"
+					},
+					{
+						value: 1,
+						label: "未支付"
+					},
+					{
+						value: 2,
+						label: "待接单"
+					},
+					{
+						value: 3,
+						label: "进行中"
+					},
+					{
+						value: 4,
+						label: "已完成"
+					},
+					{
+						value: 5,
+						label: "已取消"
+					},
+				],
+				options3: [{
+						value: 0,
+						label: "时间正序"
+					},
+					{
+						value: 1,
+						label: "时间倒序"
+					},
+				],
+				ordersList: [],
+				pageindex: 1,
+				show: false,
+				showpinjia: false,
+				ratevalue: "",
+				count: 5,
+				content: "",
+				currentorder: "",
+				evaluateindex: "",
+				totalPage: "",
+				showpay: false,
+				payment_amount: "",
+				password: "",
+				payid: "",
+				paytype: ""
+			}
+		},
+		onReachBottom() {
+			this.getordersList()
+		},
+		onPullDownRefresh() {
+			this.pageindex = 1
+			this.ordersList = []
+			this.getordersList()
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			payorder(id, price, type) {
+				this.showpay = true
+				this.payment_amount = price
+				this.payid = id
+				this.paytype = type
+			},
+			showPop(flag = true) {
+				this.password = '';
+				this.showpay = flag;
+			},
+			onChange(val) {
+				if (this.password.length < 6) {
+					this.password += val;
+				}
+
+				if (this.password.length >= 6) {
+					this.paymoney()
+					return false
+				}
+			},
+			paymoney: async function() {
+				uni.showLoading({
+					title: '支付中'
+				})
+				let res = await this.$request.post("/api/v1/order/orderPay", {
+					order_id: this.payid,
+					pay_password: this.password
+				})
+				if (res.status == 0) {
+					uni.hideLoading();
+					this.showpay = false;
+					this.password = ""
+					uni.showToast({
+						icon: 'success',
+						title: '支付成功',
+						duration: 1000
+					})
+					setTimeout(() => {
+						uni.navigateTo({
+							url: "../../order/order?type=" + this.paytype
+						})
+					}, 1000)
+				} else {
+					uni.hideLoading();
+					this.password = ""
+					uni.showModal({
+						title: "提示",
+						content: res.message,
+						confirmText: "确定",
+						showCancel: false,
+						success: (rr) => {
+							if (rr.confirm) {
+								this.showpay = false;
+							}
+						}
+					})
+				}
+			},
+			onBackspace(e) {
+				if (this.password.length > 0) {
+					this.password = this.password.substring(0, this.password.length - 1);
+				}
+			},
+			cancelOrder: async function(item, index) {
+				uni.showModal({
+					title: "提示",
+					content: "确定要取消订单吗？",
+					success: (res) => {
+						if (res.confirm) {
+							uni.requestSubscribeMessage({
+								tmplIds: ['368_VJaSVZQay3E5-yPelJKJn3R_Hu56dVflxazHiCY'],
+								success: (res) => {
+									this.confirmorder(item, index)
+								},
+								fail: (err) => {
+									this.confirmorder(item, index)
+								}
+							})
+						}
+					}
+				})
+			},
+			confirmorder: async function(item, index) {
+				let res = await this.$request.post("/api/v1/order/orderCancel", {
+					order_id: item.id
+				})
+				if (res.status == 0) {
+					uni.showToast({
+						title: "取消成功",
+						icon: "none"
+					})
+					this.ordersList.splice(index, 1)
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: res.message,
+						showCancel: false,
+						success: (res) => {}
+					})
+				}
+			},
+			loadMore() {
+				this.getordersList()
+			},
+			refresh() {
+				this.pageindex = 1
+				this.ordersList = []
+				this.getordersList()
+			},
+			evaluate(item, index) {
+				this.showpinjia = true
+				this.currentorder = item
+				this.evaluateindex = index
+			},
+			determinepop: async function() {
+				let res = await this.$request.post("/api/v1/evaluate/sumbitEvaluate", {
+					order_id: this.currentorder.id,
+					docter_id: this.currentorder.docter_id,
+					score: this.ratevalue,
+					content: this.content
+				})
+				console.log(res)
+				if (res.status == 0) {
+					uni.showToast({
+						title: "评价成功",
+						icon: "none",
+						duration: 500
+					})
+					this.ordersList[this.evaluateindex].is_evaluate = 1
+					setTimeout(() => {
+						this.showpinjia = false
+					}, 500)
+					this.$forceUpdate()
+				}
+			},
+			concelpop() {
+				this.content = ""
+				this.showpinjia = false
+			},
+			typechange(value) {
+				this.value1 = value
+				this.pageindex = 1
+				this.ordersList = []
+				this.getordersList()
+			},
+			paychange(value) {
+				this.value2 = value
+				this.pageindex = 1
+				this.ordersList = []
+				this.getordersList()
+			},
+			timechange(value) {
+				this.value3 = value
+				this.pageindex = 1
+				this.ordersList = []
+				this.getordersList()
+			},
+			getordersList: async function() {
+				let res = await this.$request.post("/api/v1/order/orderList", {
+					page: this.pageindex,
+					list_type: this.value1,
+					product_type: this.value1,
+					order_status: this.value2,
+					time_sort: this.value3
+				}, false)
+				if (res.status == 0) {
+					// this.$refs.loadRefresh.loadOver()
+					if (this.pageindex > res.data.last_page) {
+						uni.showToast({
+							title: "没有更多了",
+							icon: "none"
+						})
+					} else {
+						res.data.data.forEach((item, index) => {
+							if (item.docter === null||item.product_type == 6||item.product_type == 5||item.product_type == 3) {
+								res.data.data.splice(index, 1)
+							}
+						})
+						// res.data.data.forEach((item, index) => {
+						// 	if () {
+						// 		res.data.data.splice(index, 1)
+						// 	}
+						// })
+						// res.data.data.forEach((item, index) => {
+						// 	if () {
+						// 		res.data.data.splice(index, 1)
+						// 	}
+						// })
+						res.data.data.forEach((item, index) => {
+							if (item.product_type != 1 && item.product_type != 2) {
+								res.data.data.splice(index, 1)
+							}
+						})
+						// res.data.data.forEach((item, index) => {
+						// 	if () {
+						// 		res.data.data.splice(index, 1)
+						// 	}
+						// })
+						console.log(res.data.data)
 						this.pageindex++
-						this.totalPage = res.data.last_page
-					}
-				}
-				if (this.ordersList.length == 0) {
-					this.show = true
-				} else {
-					this.show = false
-				}
-			},
-			pinjia() {
-
-			},
-			goinfoorder(e) {
-				uni.navigateTo({
-					url: "consultingInfo?id=" + e.currentTarget.dataset.id
-				})
-			},
-			gosuggest(item) {
-				uni.navigateTo({
-					url: "opinionInfo?id=" + item.suggest.id
-				})
-			},
-			gotoeva() {
-				uni.navigateTo({
-					url: "../me_evaluate"
-				})
-			}
-		}
-	};
-</script>
-
-<style lang="scss">
-	page {
-		background-color: #fff;
-	}
-
-	.money {
-		font-size: 80rpx;
-		color: #fa3534;
-		position: relative;
-
-		.close {
-			position: absolute;
-			top: 20rpx;
-			right: 20rpx;
-			line-height: 28rpx;
-			font-size: 28rpx;
-		}
-	}
-
-	.tips {
-		color: $u-tips-color;
-	}
-
-	.cancel {
-		width: 240rpx;
-		height: 78rpx;
-		border-radius: 16rpx;
-		border: 2rpx solid #0B73B9;
-		color: #0B73B9;
-		font-size: 32rpx;
-	}
-
-	.determine {
-		width: 240rpx;
-		height: 78rpx;
-		background: #0B73B9;
-		border-radius: 16rpx;
-		color: #fff;
-		font-size: 32rpx;
-	}
-
-	.textareastyle {
-		width: 560rpx;
-		height: 269rpx;
-		padding: 25rpx;
-		border: 1px solid #C0C0C0;
-		border-radius: 16rpx;
-		font-size: 28rpx;
-	}
-
-	.main {}
-
-	.text_style {
-		font-weight: 400;
-		margin-left: 15rpx;
-		background-color: #E5F5FF;
-		color: #0B73B9;
-		width: 120rpx;
-		height: 28rpx;
-		font-size: 20rpx;
-		border-radius: 10rpx;
-		text-align: center;
-		align-items: center;
-	}
-
-	.nametaile {
-		font-size: 30rpx;
-		font-weight: 500;
-		color: #333333;
-	}
-
-	.textstyle {
-		font-size: 26rpx;
-		color: #666666;
-		font-weight: 400;
-	}
-
-	.phonezi {
-		width: 160rpx;
-		height: 54rpx;
-		background: #F6F6F6;
-		border-radius: 27rpx;
-		font-size: 28rpx;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #666666;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
-
-	.jinxing {
-		height: 30rpx;
-		font-size: 30rpx;
-		font-family: PingFangSC-Medium, PingFang SC;
-		font-weight: 500;
-		color: #EEAA3F;
-		display: flex;
-		align-items: center;
-	}
+						this.ordersList = this.ordersList.concat(res.data.data)
+						// this.totalPage = res.data.last_page
+					}
+				}
+				if (this.ordersList.length == 0) {
+					this.show = true
+				} else {
+					this.show = false
+				}
+			},
+			pinjia() {
+
+			},
+			goinfoorder(e) {
+				uni.navigateTo({
+					url: "consultingInfo?id=" + e.currentTarget.dataset.id
+				})
+			},
+			gosuggest(item) {
+				uni.navigateTo({
+					url: "opinionInfo?id=" + item.suggest.id
+				})
+			},
+			gotoeva() {
+				uni.navigateTo({
+					url: "../me_evaluate"
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.money {
+		font-size: 80rpx;
+		color: #fa3534;
+		position: relative;
+
+		.close {
+			position: absolute;
+			top: 20rpx;
+			right: 20rpx;
+			line-height: 28rpx;
+			font-size: 28rpx;
+		}
+	}
+
+	.tips {
+		color: $u-tips-color;
+	}
+
+	.cancel {
+		width: 240rpx;
+		height: 78rpx;
+		border-radius: 16rpx;
+		border: 2rpx solid #0B73B9;
+		color: #0B73B9;
+		font-size: 32rpx;
+	}
+
+	.determine {
+		width: 240rpx;
+		height: 78rpx;
+		background: #0B73B9;
+		border-radius: 16rpx;
+		color: #fff;
+		font-size: 32rpx;
+	}
+
+	.textareastyle {
+		width: 560rpx;
+		height: 269rpx;
+		padding: 25rpx;
+		border: 1px solid #C0C0C0;
+		border-radius: 16rpx;
+		font-size: 28rpx;
+	}
+
+	.main {}
+
+	.text_style {
+		font-weight: 400;
+		margin-left: 15rpx;
+		background-color: #E5F5FF;
+		color: #0B73B9;
+		width: 120rpx;
+		height: 28rpx;
+		font-size: 20rpx;
+		border-radius: 10rpx;
+		text-align: center;
+		align-items: center;
+	}
+
+	.nametaile {
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #333333;
+	}
+
+	.textstyle {
+		font-size: 26rpx;
+		color: #666666;
+		font-weight: 400;
+	}
+
+	.phonezi {
+		width: 160rpx;
+		height: 54rpx;
+		background: #F6F6F6;
+		border-radius: 27rpx;
+		font-size: 28rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #666666;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.jinxing {
+		height: 30rpx;
+		font-size: 30rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #EEAA3F;
+		display: flex;
+		align-items: center;
+	}
 </style>

pages/index/article.vue

@@ -0,0 +1,21 @@
+<template>
+	<view class="main">
+		<web-view :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		onLoad(op) {
+			this.url = op.url
+		},
+		data() {
+			return {
+				url: ""
+			}
+		},
+	}
+</script>
+
+<style>
+</style>

pages/index/index.vue

@@ -1,593 +1,607 @@
-<template>
-	<view class="main">
-		<view class="">
-			<u-search :clearabled="true" shape="round" search-icon-color="#EEAA3F" @custom="searchvalue" :show-action="true"
-			 placeholder="搜索医生、医院、服务包" v-model="keyword"></u-search>
-		</view>
-		<view class="margin-top-sm margin-bottom-sm">
-			<official-account></official-account>
-		</view>
-		<view class="indexswiper" style="margin-top: 10rpx;">
-			<u-swiper :list="ordinary" :imghos="imghos" mode="dot"></u-swiper>
-		</view>
-		<view class="tltleStyle">
-			<u-section title="精选服务" font-size="40" line-color="#0B73BA" :bold="true" :right="false"></u-section>
-		</view>
-		<view class="gridstyle">
-			<u-grid :col="3" :border="false">
-				<view @click="gotoxuanze(item)" data-index="1" v-for="(item,index) in icons" :key="index">
-					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" :src="item.image" shape="circle"></u-image>
-						<view class="grid-text">{{item.name}}</view>
-					</u-grid-item>
-				</view>
-				<!-- <view class="" @click="gotoxuanze" data-index="2">
-					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indextu.png"
-						 shape="circle"></u-image>
-						<view class="grid-text">图文咨询</view>
-					</u-grid-item>
-				</view> -->
-				<!-- <view class="" @click="gotoxuanze" data-index="3">
-					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexmen.png"
-						 shape="circle"></u-image>
-						<view class="grid-text">门诊预约</view>
-					</u-grid-item>
-				</view> -->
-				<!-- <view class="" @click="vaccines">
-					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexyimiao.png"
-						 shape="circle"></u-image>
-						<view class="grid-text">疫苗接种</view>
-					</u-grid-item>
-				</view> -->
-				<!-- <view class="" @click="childcare">
-					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexerbao.png"
-						 shape="circle"></u-image>
-						<view class="grid-text">儿保预约</view>
-					</u-grid-item>
-				</view> -->
-				<!-- <view class="" @click="servicepacks">
-					<u-grid-item>
-						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexservice.png"
-						 shape="circle"></u-image>
-						<view class="grid-text">服务包</view>
-					</u-grid-item>
-				</view> -->
-			</u-grid>
-		</view>
-		<view class="margin-top-sm">
-			<u-notice-bar type="error" bg-color="white" color="black" border-radius="15" :list="configInfo.notices" mode="vertical"></u-notice-bar>
-		</view>
-		<view class="tltleStyle">
-			<u-section title="热门推荐" font-size="40" line-color="#0B73BA" :bold="true" :right="false"></u-section>
-		</view>
-		<view class="cu-card case" style="margin-top: 20rpx;background-color: transparent;border-radius: 16rpx;position: relative;">
-			<swiper @change="swiperChange" :indicator-dots="false" style="height: 426rpx;border-radius:16rpx;background-color: transparent;"
-			 :autoplay="true" :interval="3000" :duration="1000" :current="itemcurrent">
-				<swiper-item style="background-color: transparent;" v-for="(item,index) in hotlist" :key="index">
-					<view class="cu-item shadow" style="margin: 0;background-color: transparent;height: 100%;">
-						<view class="image">
-							<image :src="imghos+item.image" style="height: 426rpx;" mode="heightFix"></image>
-							<!-- <view class="cu-bar bg-shadeBottom" style="background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0));bottom:44rpx ;">
-								<text class="text-cut">我已天理为凭，踏入这片荒芜，不再受凡人的枷锁遏制。我已天理为凭，踏入这片荒芜，不再受凡人的枷锁遏制。</text>
-							</view> -->
-						</view>
-					</view>
-				</swiper-item>
-			</swiper>
-			<view class="dots">
-				<view :class="index==itemcurrent?'dot active':'dot'" v-for="(item,index) in hotlist" :key="index"></view>
-			</view>
-		</view>
-		<view class="tltleStyle">
-			<u-section title="推荐医生" font-size="40" line-color="#0B73BA" :bold="true" :right="false"></u-section>
-		</view>
-		<view style="width: 100%;">
-			<view class="recommendstyle margin-top-sm" v-for="(item,index) in doctorList" :key="index">
-				<view class="base_item">
-					<view class="base_item_zi" @click.stop="gotoinfo" :data-id="item.id">
-						<view class="base_item_zi_items">
-							<view class="base_item_zi_content" style="height: 241rpx;background-color:#FBFBFB;">
-								<image style="width: 120rpx;height: 120rpx;border-radius: 50%;" :src="item.avatar">
-								</image>
-								<view class="follow_style" @click.stop="submitCollect" :data-index="index" :data-id="item.id" v-if="item.is_collect==0">
-									关注
-								</view>
-								<view class="follow_style" @click.stop="submitCollect" :data-index="index" :data-id="item.id" style="background-color: #fff;color: rgb(208, 105, 150);border:2rpx solid rgb(208, 105, 150);"
-								 v-else>
-									已关注
-								</view>
-								<view class="content_right">
-									<view class="" style="display: flex;align-items: center;">
-										<text style="font-size: 32rpx; font-weight: bold;">{{item.name}}</text>
-										<text class="text_style" v-for="(itm,index) in item.label_texts" :key="index">{{itm.label_name}}</text>
-									</view>
-									<view class="m_gray_small">
-										科室：<text style="color:#333333;">{{item.office.name||'暂无'}} {{item.qualification.name||'暂无'}}</text>
-									</view>
-									<view class="flex justify-start align-center flex-wrap" style="position: relative;">
-										<u-tag bg-color="#F2F2F2" color="#666666" border-color="#F2F2F2" v-if="item.is_chat==1" style="margin-top:20rpx ; margin-right: 20rpx;"
-										 text="图文" shape="circle" />
-										<u-tag bg-color="#F2F2F2" color="#666666" border-color="#F2F2F2" v-if="item.is_phone==1" style="margin-top:20rpx ; margin-right: 20rpx;"
-										 text="电话" shape="circle" />
-										<u-tag bg-color="#F2F2F2" color="#666666" border-color="#F2F2F2" v-if="item.is_appoint==1" style="margin-top:20rpx ; margin-right: 20rpx;"
-										 text="门诊" shape="circle" />
-									</view>
-								</view>
-							</view>
-							<view class="foot_juli padding-sm">
-								<u-line color="#f6f6f6" />
-								<view class="flex justify-center margin-top-sm" style="color: rgba(0,0,0,0.54);">
-									<view class="text-sm" style="flex: 1; text-align: left;">
-										评分：
-										<text style="color: #FF7B72;">{{item.score}}</text>
-									</view>
-									<view class="text-sm" style="flex: 1; text-align: center;">
-										服务：
-										<text style="color: #FF7B72;">{{item.service_persons}}</text>
-									</view>
-									<view class="text-sm" style="flex: 1; text-align: right;">
-										距离：
-										<text style="color: #FF7B72;">{{item.distance!='未知'?parseInt(item.distance/1000)+'km':'未知'}}</text>
-									</view>
-								</view>
-								<view class="doctor_style margin-top-sm">
-									<view class="doctor_style_item">
-										{{item.intro}}
-									</view>
-									<view class="text-black flex justify-between align-center margin-top-sm" style="font-size: 30rpx;">
-										<view class="jisu flex align-center">
-											<image src="../../static/img/speed.png" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;margin-top: 6rpx;"
-											 mode=""></image>急速响应
-										</view>
-										<view class="">
-											服务
-											<text class="text-red text-bold text-xl" style="margin-right: 10rpx;">￥{{item.phone_price/100}}</text>
-											起
-										</view>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-
-				</view>
-			</view>
-		</view>
-		<view class="margin-tb padding-tb-xs">
-			<u-loadmore :status="nomore" :load-text="loadText" :icon-type="flower" />
-		</view>
-		<u-back-top :scroll-top="scrollTop" bottom="80" top="400"></u-back-top>
-		<u-no-network></u-no-network>
-	</view>
-</template>
-
-<script>
-	import {
-		getLocation
-	} from "../../common/authorize.js"
-	var user = require('../../common/user.js');
-	import {
-		mapState,
-		mapMutations,
-		mapGetters,
-		mapActions
-	} from 'vuex';
-	import store from '@/store'
-	export default {
-		computed: {
-			...mapGetters({
-				hasLogin: 'verifyJwt'
-			}),
-			...mapState(['user'])
-		},
-		onShow() {
-			this.GetCurrentAddress()
-			this.getDoctorList()
-			this.getindexImg()
-			this.hasLogin = store.getters['verifyJwt']
-		},
-		onLoad(options) {
-			this.getconfigData()
-			this.imghos = this.$imgHost
-		},
-		data() {
-			return {
-				itemcurrent: 0,
-				scrollTop: 0,
-				keyword: "",
-				loadText: {
-					nomore: '暂无更多医生推荐'
-				},
-				doctorList: [],
-				latitude: 0,
-				longitude: 0,
-				pageindex: 1,
-				configInfo: {},
-				icons: [],
-				imghos: "",
-				hotlist: [],
-				ordinary: []
-			}
-		},
-		onHide() {
-			this.pageindex = 1
-			this.doctorList = []
-		},
-		onReachBottom() {
-			this.getDoctorList()
-		},
-		onShareAppMessage() {
-			return {
-				title: "熙宝健康",
-				success: res => {
-					console.log(res)
-				}
-			}
-		},
-		methods: {
-			getindexImg: async function() {
-				let res = await this.$request.post("/api/v1/common/icons", {
-					type: 1
-				})
-				if (res.status == 200) {
-					this.icons = res.data
-				}
-			},
-			swiperChange(e) {
-				this.itemcurrent = e.detail.current
-			},
-			catchTouchMove() {
-				return false
-			},
-			//监听滚动
-			onPageScroll(e) {
-				this.scrollTop = e.scrollTop;
-			},
-			gotoxuanze(item) {
-				if (this.hasLogin) {
-					if (item.id == 4) {
-						uni.navigateTo({
-							url: "../vaccines/vaccines_info"
-						})
-						return false
-					}
-					if (item.id == 5) {
-						uni.navigateTo({
-							url: "../childcare/child_care"
-						})
-						return false
-					}
-					if (item.id == 6) {
-						uni.navigateTo({
-							url: "../service_packs/introduce"
-						})
-						return false
-					}
-					uni.navigateTo({
-						url: '../doctor_related/select_doctor?index=' + item.id
-					})
-				} else {
-					uni.showModal({
-						title: "提示",
-						content: "暂未登录，请前往登录",
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: "../login/login"
-								})
-							}
-						}
-					})
-				}
-
-			},
-			gotoinfo(e) {
-				if (this.hasLogin) {
-					uni.navigateTo({
-						url: "../doctor_related/doctor_info?id=" + e.currentTarget.dataset.id + "&index=1"
-					})
-				} else {
-					uni.showModal({
-						title: "提示",
-						content: "暂未登录，请前往登录",
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: "../login/login"
-								})
-							}
-						}
-					})
-				}
-
-			},
-			getDoctorList: async function() {
-				let res = await this.$request.post("/api/v1/docter/docterList", {
-					page: this.pageindex,
-					latitude: this.latitude,
-					longitude: this.longitude
-				}, false)
-				let status = user.islogin(res)
-				if (status) {
-					// this.doctorList = res.data.data
-					if (this.pageindex > res.data.last_page) {
-
-					} else {
-						this.doctorList = this.doctorList.concat(res.data.data)
-						this.pageindex++
-					}
-				}
-			},
-			submitCollect: async function(e) {
-				if (this.hasLogin) {
-					let res = await this.$request.post("/api/v1/collection/submitCollect", {
-						type: 1,
-						relation_id: e.currentTarget.dataset.id
-					}, false)
-					if (res.status == 0) {
-						if (res.data.is_collect == 0) {
-							uni.showToast({
-								title: "取消成功",
-								icon: "none"
-							})
-							this.doctorList[e.currentTarget.dataset.index].is_collect = res.data.is_collect
-						} else {
-							uni.showToast({
-								title: "关注成功",
-								icon: "none"
-							})
-							this.doctorList[e.currentTarget.dataset.index].is_collect = res.data.is_collect
-						}
-					}
-				} else {
-					uni.showModal({
-						title: "提示",
-						content: "暂未登录，请前往登录",
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: "../login/login"
-								})
-							}
-						}
-					})
-				}
-			},
-			servicepacks() {
-				uni.navigateTo({
-					url: "../service_packs/introduce"
-				})
-			},
-			searchvalue(value) {
-				uni.navigateTo({
-					url: "../doctor_related/select_doctor?value=" + value
-				})
-			},
-			childcare() {
-				if (this.hasLogin) {
-					uni.navigateTo({
-						url: "../childcare/child_care"
-					})
-				} else {
-					uni.showModal({
-						title: "提示",
-						content: "暂未登录，请前往登录",
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: "../login/login"
-								})
-							}
-						}
-					})
-				}
-			},
-			vaccines() {
-				if (this.hasLogin) {
-					uni.navigateTo({
-						url: "../vaccines/vaccines_info"
-					})
-				} else {
-					uni.showModal({
-						title: "提示",
-						content: "暂未登录，请前往登录",
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: "../login/login"
-								})
-							}
-						}
-					})
-				}
-
-			},
-			getconfigData: async function() {
-				let res = await this.$request.post("/api/v1/common/configList", {}, false)
-				console.log(res)
-				if (res.status == 0) {
-					this.configInfo = res.data
-					this.hotlist = res.data.banners.filter(item => item.type == 1)
-					this.ordinary = res.data.banners.filter(item => item.type == 2)
-				}
-			},
-			//获取当前地址
-			GetCurrentAddress() {
-				getLocation().then(res => {
-					this.latitude = res.latitude
-					this.longitude = res.longitude
-					uni.setStorageSync("latitude", res.latitude)
-					uni.setStorageSync("longitude", res.longitude)
-				}).catch(res => {
-
-				})
-			},
-		}
-	};
-</script>
-
-<style scoped lang="scss">
-	.main {
-		padding-top: 10rpx;
-		padding-left: 20rpx;
-		padding-right: 20rpx;
-
-	}
-
-	.dots {
-		position: absolute;
-		left: 0;
-		right: 0;
-		bottom: 30rpx;
-		display: flex;
-		justify-content: center;
-	}
-
-	.dots .dot {
-		margin: 0 8rpx;
-		width: 10rpx;
-		height: 10rpx;
-		background: rgba(0, 0, 0, .3);
-		border-radius: 8rpx;
-		transition: all .6s;
-	}
-
-	.dots .dot.active {
-		width: 24rpx;
-		height: 10rpx;
-		background: #fff;
-	}
-
-	.gridstyle {
-		height: 450rpx;
-		background-color: #fff;
-		border-radius: 15rpx;
-		display: flex;
-		align-items: center;
-		box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);
-		margin-top: 20rpx;
-	}
-
-	.doctor_style {
-		color: rgba(0, 0, 0, 0.54);
-	}
-
-	.doctor_style_item {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		display: -webkit-box;
-		-webkit-line-clamp: 2;
-		-webkit-box-orient: vertical;
-	}
-
-	.jisu {
-		color: rgb(238, 170, 63);
-	}
-
-	.follow_style {
-		position: absolute;
-		bottom: 76rpx;
-		left: 37rpx;
-		z-index: 1;
-		width: 106rpx;
-		height: 40rpx;
-		padding: 4rpx 0;
-		background-color: rgb(208, 105, 150);
-		box-sizing: border-box;
-		color: #fff;
-		text-align: center;
-		border-radius: 60rpx;
-		font-size: 24rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-
-	.base_item {
-		// position: absolute;
-		// top: 0;
-		// left: 0;
-		// right: 0;
-		// z-index: 1;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-	}
-
-	.base_item_zi {
-		// padding-top: 20rpx;
-		// margin: 20rpx 20rpx;
-		position: relative;
-		box-sizing: border-box;
-	}
-
-	.base_item_zi_items {
-		box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);
-		background-color: #fff;
-		position: relative;
-		border-radius: 8rpx;
-		box-sizing: border-box;
-	}
-
-	.base_item_zi_content {
-		display: flex;
-		justify-content: center;
-		padding: 30rpx 30rpx;
-		overflow: hidden;
-		position: relative;
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.text_style {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		font-weight: 400;
-		margin-left: 15rpx;
-		background-color: #E5F5FF;
-		color: #0B73B9;
-		// width: 100rpx;
-		height: 28rpx;
-		font-size: 20rpx;
-		border-radius: 10rpx;
-	}
-
-	.m_gray_small {
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		color: rgba(0, 0, 0, 0.54);
-		margin-top: 20rpx;
-		font-size: 28rpx;
-	}
-
-	.content_right {
-		flex: 1;
-		margin-left: 20rpx;
-		overflow: hidden;
-		position: relative;
-		box-sizing: border-box;
-	}
-
-	.foot_item {
-		background-color: #F7F7F7;
-		box-sizing: border-box;
-	}
-
-	.grid-text {
-		font-size: 28rpx;
-		margin-top: 4rpx;
-		color: $u-type-info;
-	}
-
-	.tltleStyle {
-		padding: 30rpx 30rpx 15rpx 15rpx;
-		// font-weight: bold;
-		// font-size: 40rpx;
-	}
+<template>
+	<view class="main">
+		<view class="">
+			<u-search :clearabled="true" shape="round" search-icon-color="#EEAA3F" @custom="searchvalue" :show-action="true"
+			 placeholder="搜索医生、医院、服务包" v-model="keyword"></u-search>
+		</view>
+		<view class="margin-top-sm margin-bottom-sm">
+			<official-account></official-account>
+		</view>
+		<view class="indexswiper" style="margin-top: 10rpx;">
+			<u-swiper :list="ordinary" :imghos="imghos" mode="dot" @click="gotoarticle"></u-swiper>
+		</view>
+		<view class="tltleStyle">
+			<u-section title="精选服务" font-size="40" line-color="#0B73BA" :bold="true" :right="false"></u-section>
+		</view>
+		<view class="gridstyle">
+			<u-grid :col="3" :border="false">
+				<view @click="gotoxuanze(item)" data-index="1" v-for="(item,index) in icons" :key="index">
+					<u-grid-item>
+						<u-image width="120rpx" height="120rpx" :src="item.image" shape="circle"></u-image>
+						<view class="grid-text">{{item.name}}</view>
+					</u-grid-item>
+				</view>
+				<!-- <view class="" @click="gotoxuanze" data-index="2">
+					<u-grid-item>
+						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indextu.png"
+						 shape="circle"></u-image>
+						<view class="grid-text">图文咨询</view>
+					</u-grid-item>
+				</view> -->
+				<!-- <view class="" @click="gotoxuanze" data-index="3">
+					<u-grid-item>
+						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexmen.png"
+						 shape="circle"></u-image>
+						<view class="grid-text">门诊预约</view>
+					</u-grid-item>
+				</view> -->
+				<!-- <view class="" @click="vaccines">
+					<u-grid-item>
+						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexyimiao.png"
+						 shape="circle"></u-image>
+						<view class="grid-text">疫苗接种</view>
+					</u-grid-item>
+				</view> -->
+				<!-- <view class="" @click="childcare">
+					<u-grid-item>
+						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexerbao.png"
+						 shape="circle"></u-image>
+						<view class="grid-text">儿保预约</view>
+					</u-grid-item>
+				</view> -->
+				<!-- <view class="" @click="servicepacks">
+					<u-grid-item>
+						<u-image width="120rpx" height="120rpx" src="https://zhengda.oss-cn-chengdu.aliyuncs.com/baoma/static/toolimg/indexservice.png"
+						 shape="circle"></u-image>
+						<view class="grid-text">服务包</view>
+					</u-grid-item>
+				</view> -->
+			</u-grid>
+		</view>
+		<view class="margin-top-sm">
+			<u-notice-bar type="error" bg-color="white" color="black" border-radius="15" :list="configInfo.notices" mode="vertical"></u-notice-bar>
+		</view>
+		<view class="tltleStyle">
+			<u-section title="热门推荐" font-size="40" line-color="#0B73BA" :bold="true" :right="false"></u-section>
+		</view>
+		<view class="cu-card case" style="margin-top: 20rpx;background-color: transparent;border-radius: 16rpx;position: relative;">
+			<swiper @change="swiperChange" :indicator-dots="false" style="height: 426rpx;border-radius:16rpx;background-color: transparent;"
+			 :autoplay="true" :interval="3000" :duration="1000" :current="itemcurrent">
+				<swiper-item style="background-color: transparent;" v-for="(item,index) in hotlist" :key="index">
+					<view class="cu-item shadow" style="margin: 0;background-color: transparent;height: 100%;" @click="gotojournalism(index)">
+						<view class="image">
+							<image :src="imghos+item.image" style="height: 426rpx;" mode="heightFix"></image>
+							<!-- <view class="cu-bar bg-shadeBottom" style="background-image: linear-gradient(rgba(0, 0, 0, 0.0), rgba(0, 0, 0, 0));bottom:44rpx ;">
+								<text class="text-cut">我已天理为凭，踏入这片荒芜，不再受凡人的枷锁遏制。我已天理为凭，踏入这片荒芜，不再受凡人的枷锁遏制。</text>
+							</view> -->
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class="dots">
+				<view :class="index==itemcurrent?'dot active':'dot'" v-for="(item,index) in hotlist" :key="index"></view>
+			</view>
+		</view>
+		<view class="tltleStyle">
+			<u-section title="推荐医生" font-size="40" line-color="#0B73BA" :bold="true" :right="false"></u-section>
+		</view>
+		<view style="width: 100%;">
+			<view class="recommendstyle margin-top-sm" v-for="(item,index) in doctorList" :key="index">
+				<view class="base_item">
+					<view class="base_item_zi" @click.stop="gotoinfo" :data-id="item.id">
+						<view class="base_item_zi_items">
+							<view class="base_item_zi_content" style="height: 241rpx;background-color:#FBFBFB;">
+								<image style="width: 120rpx;height: 120rpx;border-radius: 50%;" :src="item.avatar">
+								</image>
+								<view class="follow_style" @click.stop="submitCollect" :data-index="index" :data-id="item.id" v-if="item.is_collect==0">
+									关注
+								</view>
+								<view class="follow_style" @click.stop="submitCollect" :data-index="index" :data-id="item.id" style="background-color: #fff;color: rgb(208, 105, 150);border:2rpx solid rgb(208, 105, 150);"
+								 v-else>
+									已关注
+								</view>
+								<view class="content_right">
+									<view class="" style="display: flex;align-items: center;">
+										<text style="font-size: 32rpx; font-weight: bold;">{{item.name}}</text>
+										<text class="text_style" v-for="(itm,index) in item.label_texts" :key="index">{{itm.label_name}}</text>
+									</view>
+									<view class="m_gray_small">
+										科室：<text style="color:#333333;">{{item.office.name||'暂无'}} {{item.qualification.name||'暂无'}}</text>
+									</view>
+									<view class="flex justify-start align-center flex-wrap" style="position: relative;">
+										<u-tag bg-color="#F2F2F2" color="#666666" border-color="#F2F2F2" v-if="item.is_chat==1" style="margin-top:20rpx ; margin-right: 20rpx;"
+										 text="图文" shape="circle" />
+										<u-tag bg-color="#F2F2F2" color="#666666" border-color="#F2F2F2" v-if="item.is_phone==1" style="margin-top:20rpx ; margin-right: 20rpx;"
+										 text="电话" shape="circle" />
+										<u-tag bg-color="#F2F2F2" color="#666666" border-color="#F2F2F2" v-if="item.is_appoint==1" style="margin-top:20rpx ; margin-right: 20rpx;"
+										 text="门诊" shape="circle" />
+									</view>
+								</view>
+							</view>
+							<view class="foot_juli padding-sm">
+								<u-line color="#f6f6f6" />
+								<view class="flex justify-center margin-top-sm" style="color: rgba(0,0,0,0.54);">
+									<view class="text-sm" style="flex: 1; text-align: left;">
+										评分：
+										<text style="color: #FF7B72;">{{item.score}}</text>
+									</view>
+									<view class="text-sm" style="flex: 1; text-align: center;">
+										服务：
+										<text style="color: #FF7B72;">{{item.service_persons}}</text>
+									</view>
+									<view class="text-sm" style="flex: 1; text-align: right;">
+										距离：
+										<text style="color: #FF7B72;">{{item.distance!='未知'?parseInt(item.distance/1000)+'km':'未知'}}</text>
+									</view>
+								</view>
+								<view class="doctor_style margin-top-sm">
+									<view class="doctor_style_item">
+										{{item.intro}}
+									</view>
+									<view class="text-black flex justify-between align-center margin-top-sm" style="font-size: 30rpx;">
+										<view class="jisu flex align-center">
+											<image src="../../static/img/speed.png" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;margin-top: 6rpx;"
+											 mode=""></image>急速响应
+										</view>
+										<view class="">
+											服务
+											<text class="text-red text-bold text-xl" style="margin-right: 10rpx;">￥{{getpricemin([item.phone_price,item.chat_price,item.appoint_price])/100}}</text>
+											起
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<view class="margin-tb padding-tb-xs">
+			<u-loadmore :status="nomore" :load-text="loadText" :icon-type="flower" />
+		</view>
+		<u-back-top :scroll-top="scrollTop" bottom="80" top="400"></u-back-top>
+		<u-no-network></u-no-network>
+	</view>
+</template>
+
+<script>
+	import {
+		getLocation
+	} from "../../common/authorize.js"
+	var user = require('../../common/user.js');
+	import {
+		mapState,
+		mapMutations,
+		mapGetters,
+		mapActions
+	} from 'vuex';
+	import store from '@/store'
+	export default {
+		computed: {
+			...mapGetters({
+				hasLogin: 'verifyJwt'
+			}),
+			...mapState(['user'])
+		},
+		onShow() {
+			this.GetCurrentAddress()
+			this.getDoctorList()
+			this.getindexImg()
+			this.hasLogin = store.getters['verifyJwt']
+		},
+		onLoad(options) {
+			this.getconfigData()
+			this.imghos = this.$imgHost
+		},
+		data() {
+			return {
+				itemcurrent: 0,
+				scrollTop: 0,
+				keyword: "",
+				loadText: {
+					nomore: '暂无更多医生推荐'
+				},
+				doctorList: [],
+				latitude: 0,
+				longitude: 0,
+				pageindex: 1,
+				configInfo: {},
+				icons: [],
+				imghos: "",
+				hotlist: [],
+				ordinary: []
+			}
+		},
+		onHide() {
+			this.pageindex = 1
+			this.doctorList = []
+		},
+		onReachBottom() {
+			this.getDoctorList()
+		},
+		onShareAppMessage() {
+			return {
+				title: "熙宝健康",
+				success: res => {
+					console.log(res)
+				}
+			}
+		},
+		methods: {
+			gotoarticle(index) {
+				uni.navigateTo({
+					url: './article?url=' + this.ordinary[index].url
+				})
+			},
+			gotojournalism(index) {
+				uni.navigateTo({
+					url: './article?url=' + this.hotlist[index].url
+				})
+			},
+			//取服务价格最小值
+			getpricemin(arr) {
+				return Math.min(...arr)
+			},
+			getindexImg: async function() {
+				let res = await this.$request.post("/api/v1/common/icons", {
+					type: 1
+				})
+				if (res.status == 200) {
+					this.icons = res.data
+				}
+			},
+			swiperChange(e) {
+				this.itemcurrent = e.detail.current
+			},
+			catchTouchMove() {
+				return false
+			},
+			//监听滚动
+			onPageScroll(e) {
+				this.scrollTop = e.scrollTop;
+			},
+			gotoxuanze(item) {
+				if (this.hasLogin) {
+					if (item.id == 4) {
+						uni.navigateTo({
+							url: "../vaccines/vaccines_info"
+						})
+						return false
+					}
+					if (item.id == 5) {
+						uni.navigateTo({
+							url: "../childcare/child_care"
+						})
+						return false
+					}
+					if (item.id == 6) {
+						uni.navigateTo({
+							url: "../service_packs/introduce"
+						})
+						return false
+					}
+					uni.navigateTo({
+						url: '../doctor_related/select_doctor?index=' + item.id
+					})
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: "暂未登录，请前往登录",
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "../login/login"
+								})
+							}
+						}
+					})
+				}
+
+			},
+			gotoinfo(e) {
+				if (this.hasLogin) {
+					uni.navigateTo({
+						url: "../doctor_related/doctor_info?id=" + e.currentTarget.dataset.id + "&index=1"
+					})
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: "暂未登录，请前往登录",
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "../login/login"
+								})
+							}
+						}
+					})
+				}
+
+			},
+			getDoctorList: async function() {
+				let res = await this.$request.post("/api/v1/docter/docterList", {
+					page: this.pageindex,
+					latitude: this.latitude,
+					longitude: this.longitude
+				}, false)
+				let status = user.islogin(res)
+				if (status) {
+					// this.doctorList = res.data.data
+					if (this.pageindex > res.data.last_page) {
+
+					} else {
+						this.doctorList = this.doctorList.concat(res.data.data)
+						this.pageindex++
+					}
+				}
+			},
+			submitCollect: async function(e) {
+				if (this.hasLogin) {
+					let res = await this.$request.post("/api/v1/collection/submitCollect", {
+						type: 1,
+						relation_id: e.currentTarget.dataset.id
+					}, false)
+					if (res.status == 0) {
+						if (res.data.is_collect == 0) {
+							uni.showToast({
+								title: "取消成功",
+								icon: "none"
+							})
+							this.doctorList[e.currentTarget.dataset.index].is_collect = res.data.is_collect
+						} else {
+							uni.showToast({
+								title: "关注成功",
+								icon: "none"
+							})
+							this.doctorList[e.currentTarget.dataset.index].is_collect = res.data.is_collect
+						}
+					}
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: "暂未登录，请前往登录",
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "../login/login"
+								})
+							}
+						}
+					})
+				}
+			},
+			servicepacks() {
+				uni.navigateTo({
+					url: "../service_packs/introduce"
+				})
+			},
+			searchvalue(value) {
+				uni.navigateTo({
+					url: "../doctor_related/select_doctor?value=" + value
+				})
+			},
+			childcare() {
+				if (this.hasLogin) {
+					uni.navigateTo({
+						url: "../childcare/child_care"
+					})
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: "暂未登录，请前往登录",
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "../login/login"
+								})
+							}
+						}
+					})
+				}
+			},
+			vaccines() {
+				if (this.hasLogin) {
+					uni.navigateTo({
+						url: "../vaccines/vaccines_info"
+					})
+				} else {
+					uni.showModal({
+						title: "提示",
+						content: "暂未登录，请前往登录",
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: "../login/login"
+								})
+							}
+						}
+					})
+				}
+
+			},
+			getconfigData: async function() {
+				let res = await this.$request.post("/api/v1/common/configList", {}, false)
+				console.log(res)
+				if (res.status == 0) {
+					this.configInfo = res.data
+					this.hotlist = res.data.banners.filter(item => item.type == 1)
+					this.ordinary = res.data.banners.filter(item => item.type == 2)
+				}
+			},
+			//获取当前地址
+			GetCurrentAddress() {
+				getLocation().then(res => {
+					this.latitude = res.latitude
+					this.longitude = res.longitude
+					uni.setStorageSync("latitude", res.latitude)
+					uni.setStorageSync("longitude", res.longitude)
+				}).catch(res => {
+
+				})
+			},
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	.main {
+		padding-top: 10rpx;
+		padding-left: 20rpx;
+		padding-right: 20rpx;
+
+	}
+
+	.dots {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 30rpx;
+		display: flex;
+		justify-content: center;
+	}
+
+	.dots .dot {
+		margin: 0 8rpx;
+		width: 10rpx;
+		height: 10rpx;
+		background: rgba(0, 0, 0, .3);
+		border-radius: 8rpx;
+		transition: all .6s;
+	}
+
+	.dots .dot.active {
+		width: 24rpx;
+		height: 10rpx;
+		background: #fff;
+	}
+
+	.gridstyle {
+		height: 450rpx;
+		background-color: #fff;
+		border-radius: 15rpx;
+		display: flex;
+		align-items: center;
+		box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);
+		margin-top: 20rpx;
+	}
+
+	.doctor_style {
+		color: rgba(0, 0, 0, 0.54);
+	}
+
+	.doctor_style_item {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.jisu {
+		color: rgb(238, 170, 63);
+	}
+
+	.follow_style {
+		position: absolute;
+		bottom: 76rpx;
+		left: 37rpx;
+		z-index: 1;
+		width: 106rpx;
+		height: 40rpx;
+		padding: 4rpx 0;
+		background-color: rgb(208, 105, 150);
+		box-sizing: border-box;
+		color: #fff;
+		text-align: center;
+		border-radius: 60rpx;
+		font-size: 24rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.base_item {
+		// position: absolute;
+		// top: 0;
+		// left: 0;
+		// right: 0;
+		// z-index: 1;
+		width: 100%;
+		height: auto;
+		box-sizing: border-box;
+	}
+
+	.base_item_zi {
+		// padding-top: 20rpx;
+		// margin: 20rpx 20rpx;
+		position: relative;
+		box-sizing: border-box;
+	}
+
+	.base_item_zi_items {
+		box-shadow: 0 0 50rpx 0 rgba(0, 0, 0, 0.1);
+		background-color: #fff;
+		position: relative;
+		border-radius: 8rpx;
+		box-sizing: border-box;
+	}
+
+	.base_item_zi_content {
+		display: flex;
+		justify-content: center;
+		padding: 30rpx 30rpx;
+		overflow: hidden;
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+	}
+
+	.text_style {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-weight: 400;
+		margin-left: 15rpx;
+		background-color: #E5F5FF;
+		color: #0B73B9;
+		// width: 100rpx;
+		height: 28rpx;
+		font-size: 20rpx;
+		border-radius: 10rpx;
+	}
+
+	.m_gray_small {
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: rgba(0, 0, 0, 0.54);
+		margin-top: 20rpx;
+		font-size: 28rpx;
+	}
+
+	.content_right {
+		flex: 1;
+		margin-left: 20rpx;
+		overflow: hidden;
+		position: relative;
+		box-sizing: border-box;
+	}
+
+	.foot_item {
+		background-color: #F7F7F7;
+		box-sizing: border-box;
+	}
+
+	.grid-text {
+		font-size: 28rpx;
+		margin-top: 4rpx;
+		color: $u-type-info;
+	}
+
+	.tltleStyle {
+		padding: 30rpx 30rpx 15rpx 15rpx;
+		// font-weight: bold;
+		// font-size: 40rpx;
+	}
 </style>

pages/index/paypassword.vue

@@ -35,7 +35,7 @@
 		data() {
 			return {
 				code: '',
-				type: 'password',
+				type: 'number',
 				border: true,
 				tips: '',
 				seconds: 60,