张田田 hace 1 mes
padre
commit
966db4ec0b

+ 18 - 17
.idea/workspace.xml

@@ -6,7 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="ade0a8c5-0639-4f05-956a-aae1181b5d18" name="更改" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/miniprogram/i18n/install.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/i18n/install.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/miniprogram/module/order/model/evaluate.model.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/model/evaluate.model.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.ts" beforeDir="false" afterPath="$PROJECT_DIR$/miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,23 +25,23 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;story-238&quot;,
-    &quot;junie.onboarding.icon.badge.shown&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/zhangtiantian/Desktop/six-health.applet&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "story-234",
+    "junie.onboarding.icon.badge.shown": "true",
+    "last_opened_file_path": "/Users/zhangtiantian/Desktop/six-health.applet",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "ts.external.directory.path": "/Applications/WebStorm.app/Contents/plugins/javascript-plugin/jsLanguageServicesImpl/external",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="SharedIndexes">
     <attachedChunks>
       <set>

+ 10 - 9
miniprogram/module/order/model/evaluate.model.ts

@@ -2,22 +2,23 @@ export interface EvaluateModel {
   patientConditioningRecordId: string; //	患者调理记录ID
   patientConditioningProgramId: string; //患者调理方案ID
   lineId: string; //调理任务ID
-  conditioningProgramId:number; //调理方案ID
-  complianceScore:number;  //相符度评分
-  qualityScore:number;  //质量评分
-  attitudeScore:number;  //态度评分
-  environmentScore:number;  //环境评分
-  depict:string;  //评价描述
-  imageVideos:string[];  //评价图片/视频
-  createTime:string;  //创建时间
+  conditioningProgramId: number; //调理方案ID
+  complianceScore: number;  //相符度评分
+  qualityScore: number;  //质量评分
+  attitudeScore: number;  //态度评分
+  environmentScore: number;  //环境评分
+  depict: string;  //评价描述
+  imageVideos: string[];  //评价图片/视频
+  createTime: string;  //创建时间
 }
 
 export interface OfflineEvaluateModel {
-  lineId:number,
+  lineId: number,
   patientConditioningRecordId: number;
   patientConditioningProgramId: number;
   operateTime: string;
   operateBy: string;
   conditioningProgramSupplierName: string;
   image: string;
+  name: string;
 }

+ 9 - 12
miniprogram/module/order/pages/offline-evaluateDetail/offline-evaluateDetail.ts

@@ -24,7 +24,6 @@ Page({
   },
   async onLoad(options: Record<string, string>) {
     let service = {} as OfflineEvaluateModel;
-    console.log(options, "options.goodsInfo===");
     if (options.goodsInfo) {
       const goods = JSON.parse(decodeURIComponent(options.goodsInfo));
       service = {
@@ -34,26 +33,25 @@ Page({
         operateTime: goods.operateTime || "",
         operateBy: goods.operateBy || "",
         conditioningProgramSupplierName: goods.conditioningProgramSupplierName || "",
-        image: goods.image || "",
+        image: goods.conditioningProgramPhoto || "",
+        name: goods.conditioningProgramName
       };
     }
-    console.log(service, "service===");
     this.setData({
       service,
     });
     if (service.patientConditioningRecordId) {
       try {
         const res = await getOrderGoodsEvaluationMethod("2", service.lineId);
-        console.log(res, "res===");
         const mediaList: { path: string; type: "image" | "video" }[] = [];
         if (res && res.data) {
-        if (Array.isArray(res.data.imageVideos)) {
-          res.data.imageVideos.forEach((url: string) => {
-            if (!url) return;
-            mediaList.push({
-              path: url,
-              type: parseMediaType(url),
-            });
+          if (Array.isArray(res.data.imageVideos)) {
+            res.data.imageVideos.forEach((url: string) => {
+              if (!url) return;
+              mediaList.push({
+                path: url,
+                type: parseMediaType(url),
+              });
             });
           }
           this.setData({
@@ -66,7 +64,6 @@ Page({
           });
         }
       } catch (error: any) {
-        console.log(error, "error===");
         wx.showToast({
           title: error?.errMsg || "获取评价详情失败",
           icon: "none",