在线签约

pages.json

@@ -3,19 +3,20 @@
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		
 		{
-			"path": "pages/medicalservice/medicalservice",
-			"style": {
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		}, {
 			"path": "pages/startup/startup",
 			"style": {
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": false
 			}
-		}, {
+		},{
+			"path": "pages/medicalservice/medicalservice",
+			"style": {
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},  {
 			"path": "pages/myinformation/myinformation",
 			"style": {
 				"enablePullDownRefresh": false,
@@ -69,7 +70,16 @@
 					"navigationBarTitleText": "行为积分",
 					"enablePullDownRefresh": false
 				}
-			}, {
+			}, 
+			{
+				"path": "screenorder/screenorder",
+				"style": {
+					"navigationBarTitleText": "筛查预约",
+					"enablePullDownRefresh": false,
+					"navigationStyle": "default",
+					"navigationBarBackgroundColor": "#4ac4ab"
+				}
+			},{
 				"path": "managefamily/managefamily",
 				"style": {
 					"navigationBarTitleText": "管理家庭成员",
@@ -439,15 +449,15 @@
                 }
 
                 }
-                ,{
+                // ,{
-                    "path" : "Mysigning/Mysigning",
+                //     "path" : "Mysigning/Mysigning",
-                    "style" :                                                                                    
+                //     "style" :                                                                                    
-                {
+                // {
-                    "navigationBarTitleText": "我的签约",
+                //     "navigationBarTitleText": "我的签约",
-                    "enablePullDownRefresh": false
+                //     "enablePullDownRefresh": false
-                }
+                // }
                 
-                }
+                // }
             ]
 	}],
 	"globalStyle": {

pages/medicalservice/medicalservice.vue

@@ -14,7 +14,7 @@
 			常用服务
 		</view>
 		<view class="centerbar topbar">
-			<image src="../../static/pages/yuyueshaicha.png" mode=""></image>
+			<image src="../../static/pages/yuyueshaicha.png" mode="" @tap="goAppointmentscreening"></image>
 			<image src="../../static/pages/shaichajieguo.png" mode="" @tap="result"></image>
 			<image src="../../static/pages/jiankangshangcheng.png" mode="" @tap="goshopping"></image>
 			<image src="../../static/pages/xinrenfuli.png" mode="" @tap="gomaterialbenefits"></image>
@@ -65,6 +65,11 @@
 			this.getHeathHousing();
 		},
 		methods: {
+			goAppointmentscreening() {
+				uni.navigateTo({
+					url: '/pagesB/ProductList/ProductList'
+				})
+			},
 			//跳转健康常识item
 			gohealthitem(item) {
 				uni.navigateTo({
@@ -88,7 +93,7 @@
 			gomaterialbenefits() {
 				// 第二种引入
 				// this.$store.dispatch("openPopup");
-				this.openPopup();
+				// this.openPopup();
 				setTimeout(e => {
 					uni.navigateTo({
 						url: '/pagesB/materialbenefits/materialbenefits'
@@ -111,16 +116,16 @@
 				})
 			},
 			// 筛查结果
-			result(){
+			result() {
 				uni.navigateTo({
 					url: '/pagesB/screeningResult/screeningResult'
 				})
-				
+
-				
+
 			},
 			//跳转商城
 			goshopping() {
-				this.openPopup();
+				// this.openPopup();
 				setTimeout(e => {
 					uni.navigateTo({
 						url: '/pagesB/shopping/shopping'

pagesB/ProductList/ProductList.vue

@@ -295,7 +295,7 @@
 
 				.price {
 					font-size: 36rpx;
-					color: #D43953;
+					color: #26A888;
 					line-height: 79rpx;
 					padding-left: 15rpx;
 				}

pagesB/screenorder/screenorder.vue

@@ -0,0 +1,431 @@
+<template>
+  <view class="screenorder">
+    <view class="user_info">
+      <view class="basic">
+        <view class="name">{{userInfo.residentName}}</view>
+        <view style="margin-right: 30rpx; color: #333">年龄：{{userInfo.age}}</view>
+        <view style="color: #333;">性别：{{userInfo.gender}}</view>
+      </view>
+      <view class="illness">
+        <view v-show="userInfo.disease.indexOf('0') != -1">
+          <span>无</span>
+        </view>
+        <view v-show="userInfo.disease.indexOf('1') != -1">
+          <span>高血压</span>
+        </view>
+        <view v-show="userInfo.disease.indexOf('2') != -1">
+          <span>高血糖</span>
+        </view>
+        <view v-show="userInfo.disease.indexOf('3') != -1">
+          <span>高血脂</span>
+        </view>
+      </view>
+    </view>
+    <view class="line"></view>
+    <view class="title">
+      <!-- <view></view> -->
+      <text>基本信息</text>
+    </view>
+    
+    <u-form labelPosition="left" :model="formData" :rules="rules" ref="form1">
+      <u-form-item label="预约机构" labelWidth="80">
+        <view class="uniDataSelectClass">
+          <uni-data-select v-model="formData.deptId" :localdata="DeptList" @change="changeDept" :clear="false">
+          </uni-data-select>
+        </view>
+      </u-form-item>
+      <u-form-item label="预约项目" labelWidth="80">
+        <view class="uniDataSelectClass">
+          <uni-data-select v-model="formData.projectId" :localdata="ProList" @change="changePro" :clear="false">
+          </uni-data-select>
+        </view>
+      </u-form-item>
+      <u-form-item label="预约时间" labelWidth="80">
+        <uni-datetime-picker v-model="datetimerange" type="datetimerange" rangeSeparator="至" />
+      </u-form-item>
+    </u-form>
+    <!-- <view style="display: flex;justify-content: center;margin-top: 80rpx;"><uni-data-checkbox multiple v-model="test" :localdata="test1"></uni-data-checkbox></view> -->
+    <view style="height: 180rpx;"></view>
+    <view class="btn">
+      <u-button type="primary" text="提交预约信息" @click="submit"></u-button>
+    </view>
+    <u-action-sheet :show="showSex" :actions="actions" title="请选择性别" @close="showSex = false" @select="sexSelect">
+    </u-action-sheet>
+  </view>
+</template>
+
+<script>
+  // import {
+  //   screenOrder,
+  //   getDeptList,
+  //   getProlist
+  // } from '@/service/api/jsApi.js'
+  // import {
+  //   getSex,
+  //   getBirthday,
+  //   getAgeFun
+  // } from '@/utils/conversion.js'
+  export default {
+    data() {
+      return {
+        showSex: false,
+        userInfo: {},
+        datetimerange: [Date.now(), this.todayEndTime()],
+        test: ['1'],
+        formData: {
+          residentName: '',
+          identity: '',
+          certType: '1',
+          gender: '',
+          birthday: '',
+          phone: '',
+          address: '',
+          disease: '',
+          height: '',
+          weight: '',
+          applyStartTime: '',
+          applyEndTime: '',
+          deptId: '',
+          deptName: '',
+          projectId: '',
+          projectName: ''
+        },
+        actions: [{
+            name: '男',
+            disabled: true
+          },
+          {
+            name: '女',
+            disabled: true
+          },
+        ],
+        disease: [{
+            text: '高血压',
+            value: '1'
+          },
+          {
+            text: '高血糖',
+            value: '2'
+          },
+          {
+            text: '高血脂',
+            value: '3'
+          },
+          {
+            text: '无',
+            value: '0'
+          }
+        ],
+        DeptList: [],
+        ProList: [],
+        test1: [{
+          text: '同意《用户服务协议》及《隐私政策》',
+          value: '1'
+        }],
+        rules: {
+          residentName: [{
+            required: true,
+            message: '请填写姓名',
+            trigger: ['blur', 'change']
+          }],
+          identity: [{
+            required: true,
+            message: '请填写身份证号',
+            trigger: ['blur']
+          }, {
+            validator: (rule, value, callback) => {
+              return uni.$u.test.idCard(value);
+            },
+            message: '请输入正确的身份证号',
+            trigger: ['blur'],
+          }],
+          phone: [{
+            required: true,
+            message: '请填写联系电话',
+            trigger: ['blur']
+          }, {
+            validator: (rule, value, callback) => {
+              return uni.$u.test.mobile(value);
+            },
+            message: '手机号码不正确',
+            trigger: ['blur'],
+          }],
+          address: [{
+            required: true,
+            message: '请填写家庭住址',
+            trigger: ['blur', 'change']
+          }],
+          height: [{
+            required: true,
+            message: '请填写身高',
+            trigger: ['blur', 'change']
+          }, {
+            validator: (rule, value, callback) => {
+              return uni.$u.test.number(value);
+            },
+            message: '身高格式为数字（小数）',
+            trigger: ['blur'],
+          }],
+          weight: [{
+            required: true,
+            message: '请填写体重',
+            trigger: ['blur', 'change']
+          }, {
+            validator: (rule, value, callback) => {
+              return uni.$u.test.number(value);
+            },
+            message: '体重格式为数字（小数）',
+            trigger: ['blur'],
+          }]
+        }
+      }
+    },
+    onLoad(e) {
+      if (e) {
+        this.userInfo = JSON.parse(e.userInfo)
+        this.diseaseValue = this.userInfo.disease.split(',')
+        if (this.userInfo.gender == '1') {
+          this.userInfo.gender = '男'
+        } else {
+          this.userInfo.gender = '女'
+        }
+        this.userInfo.age = getAgeFun(this.userInfo.birthday)
+      }
+      // this.init()
+      this.getDeptAndPro()
+    },
+    methods: {
+      getDeptAndPro() {
+        getDeptList(this.userInfo.registerId).then(res => {
+          if (res.data.code == 200) {
+            this.DeptList = res.data.data.map(item => {
+              return {
+                text: item.deptName,
+                value: item.deptId
+              }
+            })
+          }
+        })
+        getProlist({
+          projectType: 1,
+          status: 0
+        }).then(res => {
+          if (res.data.code == 200) {
+            this.ProList = res.data.data.map(item => {
+              return {
+                text: item.projectName,
+                value: item.projectId
+              }
+            })
+          }
+        })
+      },
+      changeDept(e) {
+        this.formData.deptName = this.DeptList.find(item => item.value == e).text
+      },
+      changePro(e) {
+        this.formData.projectName = this.ProList.find(item => item.value == e).text
+      },
+      todayEndTime() {
+        let todayYear = (new Date()).getFullYear();
+        let todayMonth = (new Date()).getMonth();
+        let todayDay = (new Date()).getDate();
+        let todayTime = (new Date(todayYear, todayMonth, todayDay, '23', '59', '59')).getTime();
+        return todayTime
+      },
+      changeDisease() {
+        if (this.formData.disease.length != 0 && this.formData.disease.find(item => item != '0')) {
+          this.disease[3].disable = true
+        }
+        if (this.formData.disease.length != 0 && this.formData.disease.find(item => item == '0')) {
+          this.disease[0].disable = true
+          this.disease[1].disable = true
+          this.disease[2].disable = true
+          this.formData.disease = ['0']
+          this.disease[3].disable = false
+        }
+        if (this.formData.disease.length == 0) {
+          for (let item in this.disease) {
+            this.disease[item].disable = false
+          }
+        }
+      },
+      changeCheckbox(e) {
+        if (e.detail.value.length != 0 && e.detail.value.find(item => item != '0')) {
+          this.disease[3].disable = true
+        }
+        if (e.detail.value.length != 0 && e.detail.value.find(item => item == '0')) {
+          this.disease[0].disable = true
+          this.disease[1].disable = true
+          this.disease[2].disable = true
+        }
+        if (e.detail.value.length == 0) {
+          for (let item in this.disease) {
+            this.disease[item].disable = false
+          }
+        }
+      },
+      process() {
+        let _this = this
+        if (!this.formData.deptId) {
+          uni.showModal({
+            title: '提示',
+            content: '请选择预约机构',
+          })
+          return
+        }
+        if (!this.formData.projectId) {
+          uni.showModal({
+            title: '提示',
+            content: '请选择预约项目',
+          })
+          return
+        }
+        if (!this.datetimerange[0] || !this.datetimerange[1]) {
+          uni.showModal({
+            title: '提示',
+            content: '预约时间请填写完整！',
+          })
+          return
+        }
+        this.formData.registerId = this.userInfo.registerId
+        this.formData.identity = this.userInfo.identity
+        this.formData.disease = this.userInfo.disease
+        this.formData.applyStartTime = this.datetimerange[0]
+        this.formData.applyEndTime = this.datetimerange[1]
+        if (this.formData.gender == '男') {
+          this.formData.gender = '1'
+        } else {
+          this.formData.gender = '2'
+        }
+        screenOrder(this.formData).then(res => {
+          this.formData.disease = this.formData.disease.split(',')
+          if (this.formData.gender == '1') {
+            this.formData.gender = '男'
+          } else {
+            this.formData.gender = '女'
+          }
+          if (res.data.code == '200') {
+            uni.showToast({
+              title: '预约成功',
+              duration: 1000
+            });
+            setTimeout(() => {
+              // uni.navigateTo({
+              //   // url: `../screensuccess/screensuccess?registerId=${res.data.data}`
+              //   url: `../orderlist/orderlist?registerId=${_this.userInfo.registerId}`
+              // })
+              uni.navigateBack({
+                delta:1
+              })
+            }, 1000)
+          }
+        })
+      },
+      submit() {
+        this.$refs.form1.validate().then(res => {
+          this.process()
+        }).catch(errors => {
+          return
+        })
+      },
+      IdentityBlur(e) {
+        this.formData.gender = getSex(e)
+        this.formData.birthday = getBirthday(e)
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  // .uniDataSelectClass {
+  //   .uni-select__selector {
+  //         z-index: 99;
+  //     }
+  // }
+    
+  .user_info {
+    border: 1px solid #4AC4AB;
+    border-radius: 10rpx;
+    padding: 40rpx 30rpx;
+    background: #f6f6f6;
+    margin-top: 50rpx;
+
+    .basic {
+      display: flex;
+      align-items: center;
+
+      .name {
+        font-size: 42rpx;
+        margin-right: 30rpx;
+        font-weight: 900;
+      }
+    }
+
+    .illness {
+      display: flex;
+      margin-top: 25rpx;
+
+      view {
+        width: 60px;
+        font-size: 14px;
+        background-color: #4AC4AB;
+        text-align: center;
+        color: #fff;
+        padding: 8rpx 6rpx;
+        border-radius: 20px;
+        margin-right: 10px;
+      }
+    }
+  }
+
+  .line {
+    height: 2rpx;
+    border-bottom: 1px dashed #999;
+    margin: 40rpx -40rpx;
+  }
+
+  .title {
+    display: flex;
+    font-size: 34rpx;
+    margin-bottom: 20rpx;
+
+    // color: #555;
+    // background: #f6f6f6;
+    // margin: 0 -40rpx 0 -40rpx;
+    // padding: 20rpx 0;
+    view {
+      width: 10rpx;
+      background: #4AC4AB;
+      height: 40rpx;
+      margin: 0 15rpx 0 0;
+    }
+  }
+
+  .screenorder {
+    padding: 0 40rpx;
+  }
+
+  /deep/.u-button--primary.data-v-2bf0e569 {
+    background-color: #4AC4AB !important;
+    border-color: #4AC4AB !important;
+  }
+
+  .btn {
+    // display: flex;
+    // flex-direction: column;
+    // align-items: center;
+    position: fixed;
+    bottom: 50rpx;
+    width: 90%;
+    z-index: 2;
+
+    /deep/.u-button {
+      height: 90rpx !important;
+    }
+  }
+
+  /deep/.u-button__text {
+    font-size: 34rpx !important;
+  }
+</style>

pagesC/Filinginformation/Filinginformation.vue

@@ -37,8 +37,7 @@
 			</view>
 			<view class="name">
 				详细地址
-				<!-- <u-input v-model="value" :type="type" :border="border" placeholder="请输入详细地址" placeholder-style="font-size: 20rpx;
+				<u-input v-model="value" :type="type" :border="border" placeholder="请输入详细地址"  />
-				font-family: Source Han Sans CN;font-weight: 400;color: #8E8E8E;" /> -->
 			</view>
 			<view class="cancelitem">
 				<view class="cancel">

pagesC/Signingagency/Signingagency.vue

@@ -213,13 +213,15 @@
 				}
 			}
 
-			.radio-content {
+			.radio-content {	
-				width: 50%;
+				    width: 56%;
-				text-align: center;
+				    text-align: center;
-				font-size: 18rpx;
+				    font-size: 19rpx;
-				position: relative;
+				    position: relative;
-				left: 50%;
+				    left: 54%;
-				transform: translateX(-50%);
+				    -webkit-transform: translateX(-50%);
+				    transform: translateX(-50%);
+				
 
 				.agreement {
 					position: absolute;