提交4.16

healthyService/pages/healthyDetail/healthyDetail.js

@@ -13,6 +13,7 @@ Page({
     order_no:'',
     order_inquiry_id:'',
     chat_id:'',
+    showWarn:false,
     status:'',
       active:0,
       img_host:app.hostConfig().imghost,
@@ -40,7 +41,24 @@ Page({
       service_type:1,
       chat_id:'',
   },
+  goHasOrder(){
   
+    let status=this.data.status;
+    if(status==4){
+        let id=this.data.order_inquiry_id;
+        app.method.navigateTo({
+            url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+id,
+           })
+    }else if(status==2){
+        let id=this.data.order_no;
+        app.method.navigateTo({
+            url: '/healthyService/pages/healthyOrderDetail/healthyOrderDetail?order_service_id='+id,
+           })
+       
+    }
+ 
+  
+},
   inputChange(e) {
     this.setData({
       [e.target.dataset.id]: e.detail.value
@@ -281,10 +299,10 @@ Page({
   },
   handleCreateServiceChatOrder(id){
     createServiceChatOrder(id).then(res=>{
-        let order_inquiry_id=res.data.order_inquiry_id;
+        let order_inquiry_id=res.order_inquiry_id;
         let chat_id=this.data.chat_id;
         app.method.navigateTo({
-            url: '/TUIService/pages/index?currentConversationID=' + chat_id + "&order_inquiry_id=" + order_inquiry_id + "&inquiry_type=3&fromType=chat" 
+            url: '/TUIService/pages/index?currentConversationID=' + chat_id + "&order_inquiry_id=" + order_inquiry_id + "&inquiry_type=1&fromType=chat" 
     })
   })
   },

healthyService/pages/healthyDetail/healthyDetail.json

@@ -2,7 +2,8 @@
   "usingComponents": {
     "nav":"../../../components/nav/nav",
     "van-popup": "@vant/weapp/popup/index",
-    "van-picker": "@vant/weapp/picker/index"
+    "van-picker": "@vant/weapp/picker/index",
+    "van-dialog": "@vant/weapp/dialog/index"
   },
   "navigationStyle":"custom"
 }

healthyService/pages/healthyDetail/healthyDetail.wxml

@@ -152,4 +152,18 @@
        确定
    </view>
     </view>
-  </van-popup>
+  </van-popup>
+  <van-dialog
+  show-cancel-button
+   class="mydailog"
+   bind:confirm="goHasOrder"
+  title="温馨提示"
+  message="{{message}}"
+  z-index="9999"
+   theme='green'
+  show="{{showWarn}}"
+  confirm-button-color="#3CC7C0"
+  cancel-button-text="取消"
+>
+
+</van-dialog>