合并分支 'liuquan' 到 'XDJK-master'

no message

查看合并请求 !6

packageA/chat/chat.wxml

@@ -27,7 +27,7 @@
 		<text>服务类型:{{serviceName}}</text>
 		<text></text>
 		<!-- <text>({{doctortitle}})</text> -->
-		<text wx:if='{{end_time!=""&&end_time!=null&&!status}}'>服务时间:<text>{{end_time}}</text></text>
+		<text wx:if='{{end_time!=""&&end_time!=null&&!status}}'>结束时间:<text>{{end_time}}</text></text>
 		<text wx:if='{{end_time!=""&&end_time!=null&&status}}'>服务状态:<text style="color:#2684ff">{{end_time}}</text></text>
 		<text wx:if='{{end_time==""||end_time==null}}'>擅长:{{doctorgoodat}}</text>
 		<view>
@@ -216,6 +216,34 @@
 						</view>
 					</view>
 				</block>
+					<!-- 推荐产品 -->
+					<block wx:if='{{item.type == "TIMCustomElem"&&item.payload.data=="RecommendedProducts"}}'>
+					<view class='recipe'>
+						<view class="recipe-doctor">
+							<image class='head' src='{{doctorimage|| noSrc}}' binderror="binderrorimg" data-type="0"></image>
+							<view class="doctor-info">
+								<view><text class="doctor-name">{{item.payload.description.name}}</text><text
+										class="doctor-title">{{doctortitle}}</text></view>
+								<view class="doctor-unit">{{item.payload.description.work_unit}}</view>
+							</view>
+						</view>
+						<view class="Report-text" wx:if='{{item.payload.description.diagnosis}}'>
+							医生为您开具了一个推荐产品，您可根据自身情况自由选择是否购买。</view>
+						<view class="scale">
+							<view class="scale-title">推荐产品：</view>
+							<view>
+								<block wx:for="{{item.payload.description.drug}}" wx:for-item="drugitem" wx:key='index'>
+									<!-- <view class="scale-item"><view>{{drugitem}}</view><view wx:if="{{item.payload.description.norms[index]}}">{{item.payload.description.norms[index]}}</view> </view> -->
+									<view class="scale-item">{{drugitem}}</view>
+								</block>
+							</view>
+						</view>
+						<view class="btn-view">
+							<!-- <view class="msg_btn" bindtap="viewRecipe" data-item="{{item.payload.description}}">查看推荐</view> -->
+							<view class="msg_btn1" bindtap="buyDrug" data-item="{{item.payload.description}}">购买产品</view>
+						</view>
+					</view>
+				</block>
 				<!-- 处方 -->
 				<block wx:if='{{item.type == "TIMCustomElem"&&item.payload.data=="Prescription"}}'>
 					<view class='recipe'>

packageA/selectUser/selectUser.js

@@ -9,7 +9,8 @@ Page({
     iShow: 0,
     id: '',
     needIdCard: 0,
-    noIdCard: 0 //显示
+    noIdCard: 0, //显示
+    invalid:true
   },
   /**
    *  生命周期函数--监听页面加载
@@ -41,7 +42,6 @@ Page({
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-
   },
 
   /**
@@ -132,6 +132,9 @@ Page({
     });
   },
   next:Util.debouce(function (e){
+    this.setData({
+      invalid:false
+    })
     wx.showLoading({
       mask:true,
       title:'加载中'
@@ -142,6 +145,9 @@ Page({
         content: "请选择或添加患者信息",
         showCancel: false,
       })
+      this.setData({
+        invalid:true
+      })
       wx.hideLoading();
       return
     } else if (that.data.needIdCard == 1 && that.data.item.card == "") {
@@ -150,6 +156,9 @@ Page({
         content: '请选择填写过身份证的患者',
         showCancel: false,
       })
+      this.setData({
+        invalid:true
+      })
       wx.hideLoading();
       return;
     }
@@ -160,9 +169,21 @@ Page({
         item: that.data.item
       })
       wx.navigateBack({
-        delta: 1
+        delta: 1,
+        success: res => {
+          this.setData({
+            invalid:true
+          })
+          wx.hideLoading();
+        },
+        fail: fail => {
+          this.setData({
+            invalid:true
+          })
+          wx.hideLoading();
+        }
       })
-      wx.hideLoading();
+   
     } else {
       var allData = wx.getStorageSync('data')
       let data = {
@@ -181,8 +202,19 @@ Page({
         console.log("firendAfterRoom",res)
         wx.reLaunch({
           url: '../chat/chat?t_unionid=' + that.data.t_unionid + '&groupID=' + res.chat_id,
+          success: res => {
+            this.setData({
+              invalid:true
+            })
+            wx.hideLoading();
+          },
+          fail: fail => {
+            this.setData({
+              invalid:true
+            })
+            wx.hideLoading();
+          }
         })
-        wx.hideLoading();
       })
     }
   },1000,true),

packageA/selectUser/selectUser.wxml

@@ -70,6 +70,7 @@
 		</view>
 	</view>
 </view>
-<view class="btn flex" style="height:{{iPhoneX?200:120}}rpx;">
-	<view class="flex" bindtap='next'>下一步</view>
+<view class="flex {{invalid?'btn':'btn1'}}" style="height:{{iPhoneX?200:120}}rpx;">
+	<view class="flex" wx:if="invalid" bindtap='next'>下一步</view>
+	<view class="flex" wx:else >下一步</view>
 </view>
\ No newline at end of file

packageA/selectUser/selectUser.wxss

@@ -130,15 +130,7 @@ page{
 	border: 2rpx solid #2684ff !important;
 	background: rgba(94, 141, 252, 0.1) !important;
 }
-
-
-
-
-
-
-
-
-.btn{
+.btn,.btn1{
 	width: 100%;
 	height: 120rpx;
 	justify-content: center;
@@ -148,14 +140,19 @@ page{
 	bottom: 0;
  background-color: #fff;
 }
-.btn>view{
+.btn>view,.btn1>view{
 	width: 690rpx;
 	height: 90rpx;
 	border-radius: 45rpx;
 	justify-content: center;
 	align-items: center;
 	color: #fff;
-	background: #2684ff;
 	font-size: 34rpx;
 	font-weight: 600;
+}
+.btn>view{
+	background: #2684ff;
+}
+.btn1>view{
+	background: #999;
 }
\ No newline at end of file

utils/config.js

@@ -6,7 +6,6 @@ const HOST_xinli_lb = 'https://static.xiaodongai.com/';
 const HOST_P = "https://static.xiaodongai.com/xiaodongai/";
 const HOST_P_K = "https://static.xiaodongai.com/xiaodongai/kongtian/";
 
-
 // const HOST= "https://test-wechat.xiaodongai.com/";
 const HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
 // var HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/';//测试库