同步代码

README.md

@@ -15,12 +15,14 @@ npm serve
 ```
 
 ### 测试环境 2021/11/17 更新
+
 - 运行命令： npm run build
 - 测试地址：http://lnh.run4wd.com/pc/
 - 发布服务器： 114.55.4.202
 - 发布目录： /datavg/lnh/pc/
-  
+
 ### 测试账号
+
 -800000056417 -1831
 -800000056418 -3193
 -800000056419 -9472
@@ -30,4 +32,4 @@ npm serve
 -800000056423 -6046
 -800000056424 -7922
 -800000056425 -2468
--800000056426 -5577  
+-800000056426 -5577 -- 有可约数据-没套餐
\ No newline at end of file

src/views/flow/components/combo.vue

 <template>
   <div class="combo">
-    <div class="title"><span class="point" v-if="reservedInfo"></span>{{reservedInfo.chooseName}}</div>
-   <!-- v-if="combos.type === '1'" -->
-    <a-radio-group
-      class="items-radios"
-      v-model="chooseId"
-      @change="onChange"
-    >
+    <div class="title">
+      <span class="point" v-if="reservedInfo"></span
+      >{{ reservedInfo.chooseName }}
+    </div>
+    <!-- v-if="combos.type === '1'" -->
+    <a-radio-group class="items-radios" v-model="chooseId" @change="onChange">
       <ul class="items">
-        <li class="item" v-for="item in chooseList" :key="item.id"
-			@click.stop="item.show=!item.show">
-          <a-radio :value="item.id" @focus="item.show=!item.show">
+        <li
+          class="item"
+          v-for="item in chooseList"
+          :key="item.id"
+          @click.stop="item.show = !item.show"
+        >
+          <a-radio :value="item.id" @focus="item.show = !item.show">
             <span>{{ item.servicecententName }}</span>
           </a-radio>
-		  <div class="desc-div" v-if="item.articleList&&item.show">
-			  <div class="flex li" v-for="(ite,i) in item.articleList" :key='ite.id'>
-				  <div class="title">{{i+1}}. 标题：{{ite.title}}</div>
-				  <div class="content">内容：{{ite.content}}</div>
-			  </div>
-		  </div>
-		  
+          <div class="desc-div" v-if="item.articleList && item.show">
+            <div
+              class="flex li"
+              v-for="(ite, i) in item.articleList"
+              :key="ite.id"
+            >
+              <div class="title">{{ i + 1 }}. 标题：{{ ite.title }}</div>
+              <div class="content">内容：{{ ite.content }}</div>
+            </div>
+          </div>
         </li>
       </ul>
     </a-radio-group>
@@ -42,15 +48,15 @@ export default {
   name: "componentName",
   components: {},
   props: {
-    id:{
-      type:String | Number,
-      default:''
-    }
+    id: {
+      type: String | Number,
+      default: "",
+    },
   },
   data() {
     return {
-      chooseId: '',
-	  chooseList: [],
+      chooseId: "",
+      chooseList: [],
       // chkvalue: [],
       // combos: {
       //   type: "2",
@@ -94,45 +100,45 @@ export default {
       //     },
       //   ],
       // },
-      reservedInfo:[]//可选择的体检套餐
+      reservedInfo: [], //可选择的体检套餐
     };
   },
-  created(){
+  created() {
     //获取产品信息-可选体检套餐
-    this.reservedInfo = JSON.parse(window.localStorage.getItem('reservedInfo'))
-	let chooseList = JSON.parse(window.localStorage.getItem('chooseList'));
-    this.chooseId = chooseList.id
-	this.chooseList = this.reservedInfo.chooseList.map((item)=>{
-		return {
-			...item,
-			show: false
-		}
-	})
-    console.log(this.chooseList)
+    this.reservedInfo = JSON.parse(window.localStorage.getItem("reservedInfo"));
+    let chooseList = JSON.parse(window.localStorage.getItem("chooseList"));
+    console.log("？？？？", chooseList, this.reservedInfo);
+    this.chooseId = chooseList.id;
+    this.chooseList = this.reservedInfo.chooseList.map((item) => {
+      return {
+        ...item,
+        show: false,
+      };
+    });
+    console.log(this.chooseList);
   },
   methods: {
     onChange(checkedValues) {
-      const chooseList = []
+      const chooseList = [];
       chooseList.push({
-        id:this.chooseId
-      })
+        id: this.chooseId,
+      });
       // 本地存储数据-选择的体检套餐
-      window.localStorage.setItem('chooseList',JSON.stringify(chooseList))
-      console.log("选择体检套餐chooseId===",this.chooseId)
+      window.localStorage.setItem("chooseList", JSON.stringify(chooseList));
+      console.log("选择体检套餐chooseId===", this.chooseId);
       // 显示"下一步"
-      this.$parent.next = true
+      this.$parent.next = true;
     },
   },
 };
 </script>
 
 <style lang="less" scoped>
-.desc-div{
-	box-sizing: border-box;
-	padding: 10px;
-	border-radius: 6px;
-	background: #f8f8f8;
-	
+.desc-div {
+  box-sizing: border-box;
+  padding: 10px;
+  border-radius: 6px;
+  background: #f8f8f8;
 }
 .combo {
   .items-radios {

src/views/flow/index.vue

@@ -31,9 +31,9 @@
             <span class="label">出生日期：</span>
             <a-input :value="customerInfo.birthDate" disabled />
           </div>
-		  <div class="item tip">
-		    【温馨提醒：女士请注意婚姻状况的选择，未婚代表不做妇科项目，需要做妇科项目检测请选择已婚，谢谢理解！】
-		  </div>
+          <div class="item tip">
+            【温馨提醒：女士请注意婚姻状况的选择，未婚代表不做妇科项目，需要做妇科项目检测请选择已婚，谢谢理解！】
+          </div>
         </div>
         <div class="reset">
           <a-button type="primary" @click="onSubmit">点击修改</a-button>
@@ -55,12 +55,12 @@
 </template>
 
 <script>
-import SelectInstitution from './components/selectInstitution.vue'
-import Combos from './components/combo.vue'
-import api from '@/api/customer'
-import { log } from 'util'
+import SelectInstitution from "./components/selectInstitution.vue";
+import Combos from "./components/combo.vue";
+import api from "@/api/customer";
+import { log } from "util";
 export default {
-  name: 'componentName',
+  name: "componentName",
   components: {
     Combos,
     SelectInstitution,
@@ -70,7 +70,7 @@ export default {
     return {
       next: false,
       previous: false,
-      id: '', //客户id
+      id: "", //客户id
       customerInfo: {
         // name: '',
         // sex: '',
@@ -81,43 +81,46 @@ export default {
       }, //客户信息
       step1: true,
       step2: false,
-    }
+    };
   },
   created() {
-    const { id } = this.$route.query
-    this.id = id
-    this.getCustomerDetail() //客户信息
+    const { id } = this.$route.query;
+    this.id = id;
+    this.getCustomerDetail(); //客户信息
+    console.log("xxxxx");
   },
   methods: {
     nextStep() {
-      this.previous = true
-      this.next = false
-      this.step1 = false
-      this.step2 = true
+      this.previous = true;
+      this.next = false;
+      this.step1 = false;
+      this.step2 = true;
     },
 
     previousStep() {
-      this.next = true
-      this.previous = false
-      this.step1 = true
-      this.step2 = false
+      this.next = true;
+      this.previous = false;
+      this.step1 = true;
+      this.step2 = false;
     },
 
     // 获取客户信息
     getCustomerDetail() {
+      console.log("ssss");
       api.getCustomerDetail({ id: parseInt(this.id) }).then((res) => {
-        if (res.returnCode == '0000') {
-          this.customerInfo = res.content
-          console.table('客户信息customerInfo=', this.customerInfo)
+        console.log("sdadad", res.content);
+        if (res.returnCode == "0000") {
+          this.customerInfo = res.content;
+          console.table("客户信息customerInfo=", this.customerInfo);
         } else {
-          this.$message.error(res.returnMsg)
+          this.$message.error(res.returnMsg);
         }
-      })
+      });
     },
     // "立即修改"
     onSubmit() {
       const { name, idType, sex, idNo, phone, birthDate, maritalStatus } =
-        this.customerInfo
+        this.customerInfo;
 
       const query = {
         id: this.id,
@@ -128,28 +131,28 @@ export default {
         phone,
         birthDate,
         maritalStatus,
-      }
+      };
       api.improveInformation(query).then((res) => {
-        if (res.returnCode == '0000') {
+        if (res.returnCode == "0000") {
           // 提交成功之后,提示成功信息,关闭"个人信息填写弹窗",并刷新当前页面
-          this.$message.success('修改信息成功')
+          this.$message.success("修改信息成功");
           setTimeout(() => {
             // 刷新列表
-            this.getCustomerDetail()
-          }, 1500)
+            this.getCustomerDetail();
+          }, 1500);
         } else {
-          this.$message.error(res.returnMsg)
+          this.$message.error(res.returnMsg);
         }
-      })
+      });
     },
   },
-}
+};
 </script>
 
 <style lang="less">
-.footbar_{
-	position: initial !important;
-}	
+.footbar_ {
+  position: initial !important;
+}
 </style>
 <style lang="less" scoped>
 .flow {
@@ -191,10 +194,10 @@ export default {
         .item {
           display: flex;
           margin-top: 14px;
-		  &.tip{
-			  font-size: 12px;
-			  color: #999;
-		  }
+          &.tip {
+            font-size: 12px;
+            color: #999;
+          }
           .label {
             display: inline-block;
             width: 120px;