Merge remote-tracking branch 'origin/dev' into dev

api/request.js

@@ -4,7 +4,8 @@ import baseurl from './baseurl.js'
 var request = function(config) {
 	return new Promise((resolve, rejected) => {
 		if (config.url != '/nurseApplet/chatRecord/updateReadStatus' && config.url !=
-			"/nurseApplet/chatRecord/sendMessage") {
+			"/nurseApplet/chatRecord/sendMessage" && config.url !=
+			`/applet/sign/apply/checkSignApply/` + uni.getStorageSync('userinfo').cardNo) {
 			uni.showLoading({
 				title: ''
 			});

pages/homepage/homepage.vue

@@ -115,16 +115,8 @@
 				uni.setStorageSync("region", 3)
 			}
 			this.region = uni.getStorageSync('region')
-			// if (this.region) {
-			// 	if (this.region == "1" || this.region == "2") {
 
-			// 	} else {
+			if (this.userinfo && this.region!="3") {
-			// 		this.family()
-			// 	}
-
-			// }
-
-			if (this.userinfo) {
 				this.patientName = this.userinfo.patientName
 				checkSignApply(this.userinfo.cardNo).then(res => {
 					if (res.data.code != 0) {
@@ -163,7 +155,7 @@
 			// 家医功能提示
 			family() {
 				this.$refs.uToast.show({
-					title: '请切换城市，再操作家医相关功能',
+					title: '当前绑定地市不支持',
 					type: 'error',
 					duration: '3000',
 
@@ -177,7 +169,7 @@
 				} else {
 					if (this.region == "3") {
 						this.family()
-					} else{
+					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
 							if (!this.checkSign) {
 								this.$refs.uToast.show({
@@ -208,7 +200,7 @@
 				} else {
 					if (this.region == "3") {
 						this.family()
-					} else{
+					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
 							if (!this.checkSign) {
 								this.$refs.uToast.show({
@@ -327,7 +319,7 @@
 				} else {
 					if (this.region == "3") {
 						this.family()
-					} else{
+					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
 							uni.navigateTo({
 								url: "/pagesC/servicerecord/servicerecord"
@@ -349,7 +341,7 @@
 				} else {
 					if (this.region == "3") {
 						this.family()
-					} else{
+					} else {
 						if (this.cityCode == "1" || this.cityCode == "2") {
 							if (!this.checkSign) {
 								this.$refs.uToast.show({

pagesB/CommodityOrder/CommodityOrder.vue

@@ -15,7 +15,7 @@
 			active-color='#26A888'></u-tabs>
 		<view class="" v-if="total>0" style="margin-top: 80rpx;padding: 3%;">
 			<view class="Apayment" v-for='(item,index) in orderlist' :key="index">
-				<view class="names">店铺名称
+				<view class="names">{{item.orderTime}}
 					<image class="picture" src="../../static/huijiantou.png" mode=""></image>
 					<span v-if="item.orderStatus=='WAIT_PAY'">待付款</span>
 					<span v-if="item.orderStatus=='WAIT_REFUND'">退款中</span>

pagesB/managefamily/managefamily.scss

@@ -8,14 +8,12 @@
 			left: 50%;
 			transform: translateX(-50%);
 			text-align: center;
-
 			.text {
 				margin-bottom: 12rpx;
 				font-size: 20rpx;
 				font-weight: 500;
 				color: #26A888;
 			}
-
 			.btn {
 				font-size: 31rpx;
 				width: 500rpx;
@@ -31,6 +29,8 @@
 
 		.forlist {
 			width: 100%;
+			    height: 82vh;
+			    overflow: auto;
 
 			.item {
 				border-radius: 10rpx;

pagesB/myevaluation/myevaluation.vue

@@ -21,7 +21,10 @@
 
 				</view>
 				<view class="bottom">
-					<span>已评价</span>
+
+					<span class="rate" v-if="item.compositeScore"><u-rate :count="5" v-model="item.compositeScore" :size='50' active-color='#F4EA2A' disabled></u-rate></span>
+					
+					<span class="rateval">已评价</span>
 				</view>
 			</view>
 		</view>
@@ -48,6 +51,7 @@
 				getPageNum:1,
 				getPageSize:20,
 				userinfo:{},
+				rateval: '', //评价星棵树
 			}
 		},
 		onShow() {
@@ -206,7 +210,17 @@
 				font-size: 28rpx;
 				font-family: Source Han Sans CN;
 				
-				span:nth-child(1) {
+				.rate{
+				display: inline-block;
+				    font-weight: 400;
+				    position: absolute;
+				    top: 50%;
+				    transform: translateY(-50%);
+				    left: 10rpx;
+				    text-align: center;
+				}
+
+				.rateval {
 					line-height: 30px;
 					width: 169rpx;
 					height: 61rpx;

pagesB/orderDetails/orderDetails.vue

@@ -11,7 +11,7 @@
 		<!-- <custom-nav nav='To' Url="/pagesB/CommodityOrder/CommodityOrder" title='商品订单'></custom-nav> -->
 		<view class="content">
 			<view class="name">
-				店铺名称
+				{{order.orderTime}}
 				<image src="../../static/huijiantou.png" mode=""></image>
 			</view>
 			<view class="details">
@@ -161,12 +161,12 @@
 					goodsOrderId: null,
 					patientId: '',
 					openid: null,
-					orderType: 'HEALTH_CONSULTATION',
+					// orderType: 'HEALTH_CONSULTATION',
-					orderStatus: 'WAIT_PAY',
+					// orderStatus: 'WAIT_PAY',
-					// orderTypeList: [
+					orderTypeList: [
-					// 	'INTEGRAL_EXCHANGE',
+						'INTEGRAL_EXCHANGE',//商城 
-					// 	'DIRECT_BUY',
+						'DIRECT_BUY',
-					// ],
+					],
 					// orderStatus: '',
 					pageSize: 15,
 					pageNum: 1,