Merge branch 'main' of http://42.192.7.176:3000/lizhichao/hitap-chat

pages.json

@@ -56,17 +56,17 @@
         "navigationBarBackgroundColor": "#FFFFFF",
         "navigationBarTextStyle": "white"
       }
-    },
+    },
-	{
+	{
-	  "path": "pages/approve/index",
+	  "path": "pages/approve/index",
-	  "style": {
+	  "style": {
-	    "navigationStyle": "custom",
+	    "navigationStyle": "custom",
-	    "navigationBarTitleText": "审批",
+	    "navigationBarTitleText": "审批",
-	    // 开启下拉刷新
+	    // 开启下拉刷新
-	    "enablePullDownRefresh": true,
+	    "enablePullDownRefresh": true,
-	    "navigationBarBackgroundColor": "#FFFFFF",
+	    "navigationBarBackgroundColor": "#FFFFFF",
-	    "navigationBarTextStyle": "white"
+	    "navigationBarTextStyle": "white"
-	  }
+	  }
 	},
     {
       "path": "pages/investigation/complete",
@@ -78,17 +78,17 @@
         "navigationBarBackgroundColor": "#FFFFFF",
         "navigationBarTextStyle": "black"
       }
-    },
+    },
-	{
+	{
-	  "path": "pages/investigation/task",
+	  "path": "pages/investigation/task",
-	  "style": {
+	  "style": {
-	    "navigationStyle": "custom",
+	    "navigationStyle": "custom",
-	    "navigationBarTitleText": "排查",
+	    "navigationBarTitleText": "排查",
-	    // 开启下拉刷新
+	    // 开启下拉刷新
-	    "enablePullDownRefresh": false,
+	    "enablePullDownRefresh": false,
-	    "navigationBarBackgroundColor": "#FFFFFF",
+	    "navigationBarBackgroundColor": "#FFFFFF",
-	    "navigationBarTextStyle": "black"
+	    "navigationBarTextStyle": "black"
-	  }
+	  }
 	},
     {
       "path": "pages/governance/index",
@@ -143,15 +143,15 @@
         "navigationBarBackgroundColor": "#F6F8FA",
         "navigationBarTextStyle": "black"
       }
-    },
+    },
-	{
+	{
-	  "path": "pages/mine/password",
+	  "path": "pages/mine/password",
-	  "style": {
+	  "style": {
-	    "navigationBarTitleText": "修改密码",
+	    "navigationBarTitleText": "修改密码",
-	    // "navigationStyle": "default",
+	    // "navigationStyle": "default",
-	    "navigationBarBackgroundColor": "#F6F8FA",
+	    "navigationBarBackgroundColor": "#F6F8FA",
-	    "navigationBarTextStyle": "black"
+	    "navigationBarTextStyle": "black"
-	  }
+	  }
 	},
     {
       "path": "pages/knowledge/index",
@@ -171,7 +171,7 @@
       }
     }
   ],
-  "tabBar": {
+  "tabBar": {
 	   // "custom": true,  
     "color": "#7A7E83",
     // tab 上的文字默认颜色
@@ -192,19 +192,19 @@
         // // 选中时的图片路径
         // "text": "首页"
         // tab 上按钮文字
-      },
+      },
-	  {
+	  {
-	    "pagePath": "pages/approve/index"
+	    "pagePath": "pages/approve/index"
-	    // "iconPath": "static/nav/jobfind.png",
+	    // "iconPath": "static/nav/jobfind.png",
-	    // "selectedIconPath": "static/nav/jobfind_active.png",
+	    // "selectedIconPath": "static/nav/jobfind_active.png",
-	    // "text": "审批"
+	    // "text": "审批"
 	  },
       {
         "pagePath": "pages/investigation/index"
         // "iconPath": "static/nav/job.png",
         // "selectedIconPath": "static/nav/job_active.png",
         // "text": "排查"
-      },
+      },
 	 
       {
         "pagePath": "pages/governance/index"

pages/index/detail.vue

@@ -93,7 +93,7 @@
             >
           </view>
           <view
-            v-if="item.answerOptions && item.answerOptions.length > 0 && item.optionType == 0"
+            v-if="item.answerOptions && item.answerOptions.length > 0 && item.optionType == 1"
             style="display: flex; flex-wrap: wrap;"
           >
             <u-checkbox-group
@@ -114,7 +114,7 @@
             </u-checkbox-group>
           </view>
           <view
-            v-if="item.answerOptions && item.answerOptions.length > 0 && item.optionType == 1"
+            v-if="item.answerOptions && item.answerOptions.length > 0 && item.optionType == 0"
             style="display: flex; flex-wrap: wrap;"
           >
             <view v-for="(item, index) in item.answerOptions" :key="index" 
@@ -141,7 +141,7 @@
           </view>
           <view
             class="btnBox"
-            v-if="item.answerOptions && item.answerOptions.length > 0 && item.optionType == 0"
+            v-if="item.answerOptions && item.answerOptions.length > 0 && item.optionType == 1"
           >
             <view class="btn" @click="handleGroup(item)">确认</view>
             <view class="btn" @click="handleGroup2(i)">清空</view>
@@ -643,10 +643,10 @@ console.log({
     handleGroup(item) {
       console.log(item)
       let text = "";
-      if (this.optionType) {
+      if (item.optionType) {
-      } else {
         text = item.checkboxValue1.join(",");
-        // text = item;
+      } else {
+        text = item;
       }
       this.handleSend(text);
     },