log

all_doctor_api/web2_request.py

@@ -4,31 +4,36 @@ from in_common.base_request import BaseRequest
 
 class web2_request(BaseRequest):
     def __init__(self):
-        self.data = self.api_load(path_setting.SERVICE_URL)
+        self.SERVICE_URL = self.api_load(path_setting.SERVICE_URL)
+        # self.SERVICE_REVIEW_URL = self.api_load(path_setting.SERVICE_REVIEW_URL)
 
-    def service_list(self, page,pagesize,is_online):
+    def service_list(self, page,pagesize,is_online,extra_filter_choice):
         self.params["page"] = page
         self.params["pagesize"] = pagesize
         self.params["is_online"] = is_online
+        self.params["extra_filter_choice"] = extra_filter_choice
+        return self.api_send(self.SERVICE_URL["service_list"])
 
-        return self.api_send(self.data["service_list"])
+    def service_review_list(self,page,pagesize,type):
+        self.params["page"] = page
+        self.params["pagesize"] = pagesize
+        self.params["type"] = type
+        return self.api_send(self.SERVICE_URL["service_review_list"])
 
-    def tag_all(self) :
-        return self.api_send(self.data["tag_all"])
+    def servicereview_option(self,id, type,csrfmiddlewaretoken):
+        self.params["id"] = id
+        self.params["type"] = type
+        self.params["csrfmiddlewaretoken"] = csrfmiddlewaretoken
+        return self.api_send(self.SERVICE_URL["servicereview_option"])
 
 
-if __name__ == '__main__':
+    def tag_all(self) :
+        return self.api_send(self.SERVICE_URL["tag_all"])
 
-    print(web2_request().service_list("1", "10", "-1"))
 
+if __name__ == '__main__':
     print(web2_request().service_list("1", "10", "-1", "-1"))
     print(web2_request().service_review_list("1", "10", "0"))
     print(web2_request().servicereview_option("209989", "1", "PC8uTySuxipukIMuqNV1OPB376C2ZZ3g"))
 
-
-
-    print(web2_request().tag_all())
-
-
     print(web2_request().tag_all())
-

all_doctor_api/web2_request.yaml

@@ -5,9 +5,12 @@ service_list:
     page: ${page}
     pagesize: ${pagesize}
     is_online: ${is_online}
-  data: {}
+    extra_filter_choice: ${extra_filter_choice}
+  data:
+    phone_num: ${phone_num}
+    vfc_code: ${vfc_code}
+    face_token: ${face_token}
   json: {}
-
   isLogin: 1
 
 
@@ -42,13 +45,9 @@ servicereview_option:
 
 
 tag_all:
-
-   method: get
-   url: /api/web2/tag/all
-   param: {}
-   data: {}
-
-   json: {}
-   isLogin: 1
-
-
+  method: get
+  url: /api/web2/tag/all
+  param: {}
+  data: {}
+  json: {}
+  isLogin: 1

all_doctor_api/web_request.yaml

@@ -25,3 +25,4 @@ doctor_submechanisms:
   data: {}
   json: {}
   isLogin: 1
+

in_common/base_request.py

@@ -102,7 +102,7 @@ class BaseRequest:
             json=req.get('json'),
             # proxies={"http":"172.30.9.226:8888"}
         )
-        print(r)
+        print(r.url,88888)
         print(r.content)
         return r.json()
 

test_doctor_case/web2_case/test_service_list.py

@@ -7,15 +7,13 @@ from in_common.base_request import BaseRequest
 
 
 class TestServiceList:
-    data = BaseRequest().api_load(path_setting.SERVICE_DATA)
-    ServiceList_case, ServiceList_data = get_ids(data, "service_list")
-
+    service_list = BaseRequest().api_load(path_setting.SERVICE_DATA)
+    ServiceList_case, ServiceList_data = get_ids(service_list, "service_list")
+    print("-----",service_list)
     @pytest.mark.parametrize("params",ServiceList_data,ids=ServiceList_case)
     def test_ServiceList(self,params):
 
-
-        r = web2_request().service_list(params['page'],params['pagesize'],params['is_online'])
-
+        r = web2_request().service_list(params['page'],params['pagesize'],params['is_online'],params['extra_filter_choice'])
         print("======",r)
 
         if r["error"] == 0:
@@ -23,4 +21,7 @@ class TestServiceList:
         elif r["error"] == 1:
             assert r["message"] == params["assert"]
        # else:
-          #  assert r['error'] == 0
+          #  assert r['error'] == 0
\ No newline at end of file
+
+
+

test_doctor_data/web2_data/service_list.yaml

 service_list:
-
-#有数据返回
-
 #我的商品菜单下有数据返回1
   -
-    case:  "数据"
+    case:  "我的商品-全部tab"
     page: "1"
     pagesize: "10"
     is_online: "-1"
+    extra_filter_choice: "-1"
     assert: 1
 
 
-
   -
     case:  "我的商品-上线tab"
     page: "1"

test_doctor_data/web2_data/service_review_list.yaml

@@ -24,3 +24,4 @@ service_review_list:
     assert: 1
 
 
+