diff --git a/pages/walkAroundManager/detail.vue b/pages/walkAroundManager/detail.vue
index 11484fd..196e28d 100644
--- a/pages/walkAroundManager/detail.vue
+++ b/pages/walkAroundManager/detail.vue
@@ -332,11 +332,10 @@
     <view
       class="bottomBtnBox"
       v-if="
-        (extendObj.errorStatus === 0 ||
-          extendObj.errorStatus === 1 ||
-          feedbackStatus === 1 ||
-          feedbackStatus === 2) &&
-        isManager
+        (extendObj.errorStatus === 0 && isManager) ||
+        (extendObj.errorStatus === 1 && isFeedback) ||
+        (feedbackStatus === 1 && isManager) ||
+        (feedbackStatus === 2 && isFeedback)
       "
     >
       <view class="bottomBtn" @click="handleAssign">{{
@@ -419,7 +418,7 @@
                 auto-height
                 v-model="suggestion"
                 placeholder="请输入整改意见"
-                :disabled="extendObj.errorStatus !== 0"
+                :disabled="extendObj.errorStatus !== 0 || !isManager"
                 style="text-align: left"
                 placeholderStyle="font-size: 28rpx;color: #CDCED1;text-align: left;"
               ></textarea>
@@ -439,7 +438,7 @@
               <div
                 class="submitImgBox"
                 @click="submitImg"
-                v-if="feedbackStatus !== 2"
+                v-if="feedbackStatus !== 2 && isFeedback"
               >
                 <image
                   class="addIcon"
@@ -483,7 +482,7 @@
                 auto-height
                 v-model="feedbackContent"
                 placeholder="请输入反馈内容"
-                :disabled="extendObj.errorStatus === 2"
+                :disabled="extendObj.errorStatus === 2 || !isFeedback"
                 style="text-align: left"
                 placeholderStyle="font-size: 28rpx;color: #CDCED1;text-align: left;"
               ></textarea>
@@ -498,13 +497,13 @@
         <view class="bottomBtnBox">
           <view
             class="bottomBtn"
-            v-if="extendObj.errorStatus === 0"
+            v-if="extendObj.errorStatus === 0 && isManager"
             @click="handleGetUpdate"
             >确定</view
           >
 
           <button
-            v-if="extendObj.errorStatus === 1"
+            v-if="extendObj.errorStatus === 1 && isFeedback"
             class="bottomBtn"
             @click="handleGetUpdate"
           >
@@ -869,6 +868,7 @@ export default {
       selectPersonObj: {}, // 当前选择的派遣人
       feedbackStatus: 0, // 回显的状态 1 为 管理员选整改的人 2 为反馈
       isManager: false, // 判断是否出现指派按钮
+      isFeedback: false, // 判断是否为反馈人
     };
   },
   components: {
@@ -963,6 +963,8 @@ export default {
       let checkList = [];
 
       let requestionList = obj.questionResponses;
+      console.log("requestionList", requestionList);
+
       if (requestionList && requestionList.length > 0) {
         requestionList.forEach((item) => {
           // type 是单选还是多选 questionType 是题目类型 暂时只有选择题
@@ -975,18 +977,19 @@ export default {
               }
             });
           }
-
-          if (type === "radio") {
-            if (item.isRequired) {
-              radioRequiredList.push(item);
-            } else {
-              radioList.push(item);
-            }
-          } else if (type === "checked") {
-            if (item.isRequired) {
-              checkRequiredList.push(item);
-            } else {
-              checkList.push(item);
+          if (!(item.score > 0)) {
+            if (type === "radio") {
+              if (item.isRequired) {
+                radioRequiredList.push(item);
+              } else {
+                radioList.push(item);
+              }
+            } else if (type === "checked") {
+              if (item.isRequired) {
+                checkRequiredList.push(item);
+              } else {
+                checkList.push(item);
+              }
             }
           }
         });
@@ -1021,6 +1024,11 @@ export default {
           this.feedbackContent = extend.feedbackContent;
           this.feedbackImgList = extend.feedbackImgList;
         }
+
+        if (extend.person.MEMBERSHIP_ID === this.user.Membership_Id) {
+          // 判断是不是反馈人
+          this.isFeedback = true;
+        }
       }
 
       console.log("this.extendObj", this.extendObj);
@@ -1187,8 +1195,8 @@ export default {
                 });
                 uni.uploadFile({
                   // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA",
-                  // url: "https://es.robot-z.cn/oss/upload", 
-                  url:"https://es.eshangtech.com/oss/upload",
+                  // url: "https://es.robot-z.cn/oss/upload",
+                  url: "https://es.eshangtech.com/oss/upload",
                   filePath: res.tempFilePath,
                   header: {
                     "Content-Type": "multipart/form-data",
@@ -1226,7 +1234,7 @@ export default {
             uni.uploadFile({
               // url: "https://user.eshangtech.com/Coop.Merchant/Handler/handler_ajax.ashx?action_type=UploadFile&folder=MBWA",
               // url: "https://es.robot-z.cn/oss/upload",
-              url:"https://es.eshangtech.com/oss/upload",
+              url: "https://es.eshangtech.com/oss/upload",
               filePath: rs.tempFilePaths[0],
               fileType: "image",
               header: {
@@ -1860,7 +1868,7 @@ export default {
 
       .itemContent {
         width: 100%;
-
+        margin-top: 16rpx;
         .title {
           font-family: "PingFangSC";
           font-weight: 400;
diff --git a/pages/walkAroundManager/index.vue b/pages/walkAroundManager/index.vue
index c47e0b4..2c4ac1c 100644
--- a/pages/walkAroundManager/index.vue
+++ b/pages/walkAroundManager/index.vue
@@ -53,29 +53,6 @@
         </view>
       </view>
 
-      <view class="otherBox">
-        <view class="questionItem">
-          <view class="quetionTitle"
-            >情况类型<text class="required">*</text></view
-          >
-
-          <radio-group class="radioGroup" @change="handleChangeSituationType">
-            <label class="radioItem">
-              <view>
-                <radio color="#3B72FF" :value="'0'" :checked="0 === current" />
-              </view>
-              <view style="font-size: 24rpx">情况正常</view>
-            </label>
-            <label class="radioItem">
-              <view>
-                <radio color="#3B72FF" :value="'1'" :checked="1 === current" />
-              </view>
-              <view style="font-size: 24rpx">急需处理</view>
-            </label>
-          </radio-group>
-        </view>
-      </view>
-
       <view class="qusetionBox">
         <!-- requestionRadioList -->
         <!-- requestionCheckedList -->
@@ -190,6 +167,29 @@
           </view>
         </view>
       </view>
+
+      <view class="otherBox">
+        <view class="questionItem">
+          <view class="quetionTitle"
+            >情况类型<text class="required">*</text></view
+          >
+
+          <radio-group class="radioGroup" @change="handleChangeSituationType">
+            <label class="radioItem">
+              <view>
+                <radio color="#3B72FF" :value="'0'" :checked="0 === current" />
+              </view>
+              <view style="font-size: 24rpx">情况正常</view>
+            </label>
+            <label class="radioItem">
+              <view>
+                <radio color="#3B72FF" :value="'1'" :checked="1 === current" />
+              </view>
+              <view style="font-size: 24rpx; text-align: left">急需处理</view>
+            </label>
+          </radio-group>
+        </view>
+      </view>
     </scroll-view>
 
     <view class="bottomBtnBox">
@@ -405,7 +405,9 @@
                     :checked="popupShowObj.choiceResponse[0] === subItem.text"
                   />
                 </view>
-                <view style="font-size: 24rpx">{{ subItem.text }}</view>
+                <view style="font-size: 24rpx; text-align: left">{{
+                  subItem.text
+                }}</view>
               </label>
             </radio-group>
           </view>
@@ -456,6 +458,7 @@ export default {
       isShowPopup: false, // 显示弹出框
       popupShowObj: {},
       questionType: "", // 判断是 单选还是多选
+      submiting: false, // 判断是否已经点击过了
     };
   },
   components: {
@@ -478,6 +481,10 @@ export default {
     },
     // 提交表单内容
     async submitUpload() {
+      if (this.submiting) {
+        return;
+      }
+
       console.log("user", this.user);
       console.log("this.detailObj", this.detailObj);
 
@@ -519,7 +526,7 @@ export default {
               textResponse: "",
               choiceResponse: item.choiceResponse,
               imageResponse: "",
-              score: item.mark ? item.mark : 0,
+              score: item.choiceResponse[0].mark || (item.mark ? item.mark : 0),
             });
           }
         });
@@ -540,7 +547,7 @@ export default {
               textResponse: "",
               choiceResponse: item.isChecked,
               imageResponse: "",
-              score: item.mark ? item.mark : 0,
+              score: item.isChecked[0].mark || (item.mark ? item.mark : 0),
             });
           }
         });
@@ -553,7 +560,7 @@ export default {
         });
         return;
       }
-
+      this.submiting = true;
       console.log("requestionRadioList", this.requestionRadioList);
       console.log("requestionCheckedList", this.requestionCheckedList);
 
@@ -580,11 +587,11 @@ export default {
       };
 
       console.log("req", req);
-
       const data = await this.$request.$webNodePOST(
         `questionnaire-responses`,
         req
       );
+      this.submiting = false;
       console.log("data", data);
       if (data.code === 200) {
         this.submit = true;
@@ -762,6 +769,11 @@ export default {
       let checkList = [];
 
       let requestionList = obj.questionnaireTemplateQuestions;
+      console.log(
+        "requestionListrequestionListrequestionListrequestionList",
+        requestionList
+      );
+
       if (requestionList && requestionList.length > 0) {
         requestionList.forEach((item) => {
           // type 是单选还是多选 questionType 是题目类型 暂时只有选择题
@@ -801,6 +813,17 @@ export default {
       console.log("evt", evt);
       console.log("obj", obj);
       obj.choiceResponse = [evt.detail.value];
+      if (obj.question.options && obj.question.options.length > 0) {
+        obj.question.options.forEach((item) => {
+          if (item.text === evt.detail.value) {
+            obj.mark = item.mark;
+          }
+        });
+      } 
+      // if(!(obj.mark>0)){
+      //   this.current = 1;
+      // }
+
       console.log("requestionRadioList", this.requestionRadioList);
 
       // this.value = evt.target.value;