Explorar o código

调试数据通信

seamong %!s(int64=6) %!d(string=hai) anos
pai
achega
6185dee611

+ 1 - 0
www/webapp/safety/dome/css/app.1034850f.css

@@ -0,0 +1 @@
+#app{font-family:Avenir,Helvetica,Arial,sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.van-radio .van-icon-checked{color:#41b883!important}.home-wrapper[data-v-7042ab2c]{font-size:1.33333rem}.title[data-v-ed42023a]{color:#333;font-size:.48rem;position:relative;line-height:1.06667rem}.title .red[data-v-ed42023a]{color:#f44;position:absolute;left:-.21333rem}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/safety/dome/css/chunk-vendors.3e971f93.css


+ 1 - 0
www/webapp/safety/dome/css/personal.c9919856.css

@@ -0,0 +1 @@
+.van-tabbar-item{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;line-height:1;font-size:.32rem;color:#7d7e80;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.van-tabbar-item__icon{font-size:.48rem;position:relative;margin-bottom:.13333rem}.van-tabbar-item__icon .van-icon{display:block}.van-tabbar-item__icon--dot:after{top:0;right:-.21333rem;width:.21333rem;height:.21333rem;content:" ";position:absolute;border-radius:100%;background-color:#f44}.van-tabbar-item__icon img{height:.48rem;display:block}.van-tabbar-item--active{color:#1989fa}.van-tabbar{width:100%;height:1.33333rem;display:-webkit-box;display:-ms-flexbox;display:flex;background-color:#fff}.van-tabbar--fixed{left:0;bottom:0;position:fixed}.care-wrapper[data-v-edcc69fc]{font-size:.8rem}.van-tabbar-item--active[data-v-edcc69fc]{color:#41b883}.router[data-v-edcc69fc]{height:calc(100vh - 1.33333rem)}.van-field__button .code-size[data-v-675eb4a6]{font-family:Arial;font-style:italic;font-weight:700;border:0;height:.93333rem;letter-spacing:.08rem;color:#00f;padding:0 .26667rem;margin-top:.13333rem;text-align:center}.login-wrapper[data-v-0196cba5]{padding:1.22667rem .26667rem 0;height:100%;background-color:#fff}.login-wrapper .certificate-wrapper[data-v-0196cba5]{padding:.13333rem .4rem}.login-wrapper .my-video[data-v-0196cba5]{width:100vw}.login-wrapper .btn[data-v-0196cba5]{display:block;margin:.8rem auto}.van-button[data-v-0196cba5],.van-cell[data-v-0196cba5],.van-nav-bar__left[data-v-0196cba5],.van-nav-bar__right[data-v-0196cba5]{font-size:.48rem}

BIN=BIN
www/webapp/safety/dome/favicon.ico


+ 26 - 0
www/webapp/safety/dome/index.html

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang=en>
+<head>
+    <meta charset=utf-8>
+    <meta http-equiv=X-UA-Compatible content="IE=edge">
+    <meta name=viewport
+          content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover">
+    <link rel=icon href=/webapp/safety/dome/favicon.ico>
+    <title>safety</title>
+    <link href=/webapp/safety/dome/css/personal.c9919856.css rel=prefetch>
+    <link href=/webapp/safety/dome/js/personal.ddfddca2.js rel=prefetch>
+    <link href=/webapp/safety/dome/css/app.1034850f.css rel=preload as=style>
+    <link href=/webapp/safety/dome/css/chunk-vendors.3e971f93.css rel=preload as=style>
+    <link href=/webapp/safety/dome/js/app.51990421.js rel=preload as=script>
+    <link href=/webapp/safety/dome/js/chunk-vendors.7d04acdd.js rel=preload as=script>
+    <link href=/webapp/safety/dome/css/chunk-vendors.3e971f93.css rel=stylesheet>
+    <link href=/webapp/safety/dome/css/app.1034850f.css rel=stylesheet>
+</head>
+<body>
+<noscript><strong>We're sorry but safety doesn't work properly without JavaScript enabled. Please enable it to
+    continue.</strong></noscript>
+<div id=app></div>
+<script src=/webapp/safety/dome/js/chunk-vendors.7d04acdd.js></script>
+<script src=/webapp/safety/dome/js/app.51990421.js></script>
+</body>
+</html>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/safety/dome/js/app.51990421.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/safety/dome/js/app.51990421.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/safety/dome/js/chunk-vendors.7d04acdd.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/safety/dome/js/chunk-vendors.7d04acdd.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 7 - 0
www/webapp/safety/dome/js/personal.ddfddca2.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
www/webapp/safety/dome/js/personal.ddfddca2.js.map


+ 10 - 7
www/webapp/safety/src/components/phone.vue

@@ -17,7 +17,7 @@
 // import { getSMS } from 'config/api';
 // import axios from 'axios';
 import { isPhone } from '@/util/index';
-import { getSMS, getTest } from '@/util/api';
+import { getSMS } from '@/util/api';
 
 export default {
   name: 'h-phone',
@@ -55,12 +55,13 @@ export default {
   // },
   methods: {
     btnTest() {
-      getTest().then((res) => {
-        console.log(res);
-      });
+      // addCare().then((res) => {
+      //   console.log(res);
+      // });
     },
     getScode() {
       const self = this;
+      // self.$emit('isPhone', self.sms.create);
       let second = 5;
       if (self.stopGet !== '发送验证码') return;
       if (isPhone(self.phone)) {
@@ -71,13 +72,15 @@ export default {
         });
         return;
       }
-      if (this.vCode.create === this.vCode.input) {
+
+      if (self.vCode.create === self.vCode.input) {
         // 发送SMS
         getSMS({
-          type: 2,
+          // type: 2,
           mobile: self.phone,
         }).then((res) => {
-          console.log(res);
+          self.sms.create = res.data.code;
+          console.log(self.sms.create);
         });
         // self.sms.create = sms.code;
         // this.$emit('isPhone', {sms,})

+ 37 - 0
www/webapp/safety/src/util/api.1.js

@@ -0,0 +1,37 @@
+import http from './ajax';
+/**
+ *
+ * @param {*} params
+ */
+
+/**
+ * 护工注册==>获取短信验证码
+ * @param {Number} params.type      类型
+ * @param {Number} params.mobile    手机号码
+ */
+// eslint-disable-next-line
+export function getSMS(params) {
+  return http.get('/moonclub/Reserve/code', params);
+  // const data = await ;
+  // // console.log(data.data);
+  // return data.data;
+}
+export function addCare(params) {
+  return http.post('/ch/JWorker/add', params);
+}
+export function userId() {
+  const id = {
+    care: ['57e245989f5160ca048b456f', '5823fe6ca84ea02e3e8b45cb', '57fdf2ea9f5160c1048b4bcf'],
+    client: [
+      '59e41443fb48a7552f8b459e',
+      '59e41443fb48a7552f8b459e',
+      '57e38f1b9f5160ac048b457d', // test/master
+      '5acb042a9f5160bc048b6b1b', // master
+      '5acd65e89f516003298b47c7', // master],
+    ],
+  };
+  return id.care[0];
+}
+// export function getTest() {
+//   return http.get('/api/code');
+// }

+ 79 - 19
www/webapp/safety/src/util/api.js

@@ -1,21 +1,81 @@
-import http from './ajax';
-/**
- *
- * @param {*} params
- */
+/* eslint-disable */
+import qs from 'qs';
+import axios from 'axios';
+// userID
+export function userId() {
+  const id = {
+    care: ['57e245989f5160ca048b456f', '5823fe6ca84ea02e3e8b45cb', '57fdf2ea9f5160c1048b4bcf'],
+    client: [
+      '59e41443fb48a7552f8b459e',
+      '59e41443fb48a7552f8b459e',
+      '57e38f1b9f5160ac048b457d', // test/master
+      '5acb042a9f5160bc048b6b1b', // master
+      '5acd65e89f516003298b47c7', // master],
+    ],
+  };
+  return localStorage.getItem('wxUserID2') != null ? localStorage.getItem('wxUserID2') : id.care[0];
+}
+export function apiPath() {
+  let path = '';
+  if (!window.location.href.indexOf('common.yiguanjia.me')) {
+    // master
+    // path = "http://common.yiguanjia.me/index.php?r=";
+    path = '';
+  } else {
+    // test
+    // path = 'https://bird.ioliu.cn/v1?url=http://common.yiguanjia.me/index.php?r=';
+    // path = 'http://commontest.yiguanjia.me/index.php?r=';
+    // path = 'http://common.yiguanjia.me/index.php?r=';
+    path = '';
+  }
+  return path;
+}
+
+// 护工注册
+export async function addCare(params) {
+  const data = await axios.post(
+    // `${apiPath()}/ch/JWorker/add`,
+    `${apiPath()}/ch/JWorker/add`,
+    qs.stringify(params),
+  );
+  return data.data.data;
+}
+// 获取用户角色
+export async function getUserRole(userId) {
+  const data = await axios.post(
+    `${apiPath()}/j/HouseKeeping/GetUser`,
+    qs.stringify({ user_id: userId }),
+  );
+  return data.data;
+}
+// 获取用户订单列表
+export async function getClientList(params) {
+  const data = await axios.post(`${apiPath()}/j/HouseKeeping/list`, qs.stringify(params));
+  return data.data;
+}
+// 获取门店地址
+export async function getStore() {
+  const data = await axios.post(`${apiPath()}/j/HouseKeeping/GetStore`);
+  return data.data;
+}
+// 用户注册==>获取短信验证码
+export async function getSMS(params) {
+  const data = await axios.post(`${apiPath()}/moonclub/reserve/code`, qs.stringify(params));
+  return data.data;
+}
+// 用户注册
+export async function userAddInfo(params) {
+  const data = await axios.post(`${apiPath()}/j/HouseKeeping/AddUserInfo`, qs.stringify(params));
+  return data.data;
+}
+// 添加订单数据 /j/HouseKeeping/Add
+export async function userAddOrder(params) {
+  const data = await axios.post(`${apiPath()}/j/HouseKeeping/Add`, qs.stringify(params));
+  return data.data;
+}
 
-/**
- * 护工注册==>获取短信验证码
- * @param {Number} params.type      类型
- * @param {Number} params.mobile    手机号码
- */
-// eslint-disable-next-line
-export function getSMS(params) {
-  return http.get('/moonclub/reserve/code', params);
-  // const data = await ;
-  // // console.log(data.data);
-  // return data.data;
-}
-export function getTest() {
-  return http.get('/api/code');
+// JGEmpolyerList
+export async function getEmpolyerList(params) {
+  const data = await axios.post(`${apiPath()}/j/JGEmpolyer/List/`, qs.stringify(params));
+  return data.data;
 }

+ 2 - 2
www/webapp/safety/src/util/index.js

@@ -143,10 +143,10 @@ export function IdCard(UUserCard, num) {
     //获取性别
     if (parseInt(UUserCard.substr(16, 1)) % 2 == 1) {
       //男
-      return '';
+      return '1';
     } else {
       //女
-      return '';
+      return '2';
     }
   }
   if (num == 3) {

+ 231 - 15
www/webapp/safety/src/views/Care/Login/index.vue

@@ -4,7 +4,7 @@
       left-arrow fixed />
     <van-cell-group>
       <!-- <van-button class="btn" @click='submit' size="large"
-        type="primary">提交</van-button> -->
+              type="primary">提交</van-button> -->
       <!-- 姓名: name -->
       <van-field required clearable v-model="user.name"
         label="姓名" placeholder="请输入姓名" autosize />
@@ -16,12 +16,62 @@
       <!-- 手机: mobilePhone -->
       <van-field required clearable v-model="user.mobilePhone"
         label="手机" placeholder="请输入手机号码" autosize />
-      <h-phone ref='hPhone' :phone='user.mobilePhone'
-        @isPhone='vPhone' />
-
+      <h-phone ref='hPhone' :phone='user.mobilePhone' />
 
+      <!-- 身份证: IDcard -->
+      <van-field required clearable v-model="user.IDcard"
+        label="身份证" placeholder="请输入身份证" autosize />
+      <!-- 电话: phone -->
+      <van-field required clearable v-model="user.phone"
+        label="电话" placeholder="请输入电话号码" autosize />
+      <!-- 邮箱: email -->
+      <van-field required clearable type='email' v-model="user.email"
+        label="邮箱" placeholder="请输入邮箱" autosize />
+      <!-- 户籍地址: address1 -->
+      <van-field required clearable v-model="user.address1"
+        label="户籍地址" placeholder="请输入户籍地址" autosize />
+      <!-- 居住地址: address2 -->
+      <van-field required clearable v-model="user.address2"
+        label="居住地址" placeholder="请输入居住地址" autosize />
+      <!-- <van-button class="btn" @click='submit' size="large"
+                type="primary">提交</van-button> -->
+      <!-- 通讯地址: address3 -->
+      <van-field required clearable v-model="user.address3"
+        label="通讯地址" placeholder="请输入通讯地址" autosize />
+      <!-- 邮编: ZIPcode -->
+      <van-field required clearable v-model="user.ZIPcode"
+        label="邮编" placeholder="请输入邮编" autosize />
+      <!-- 证书(图片): certificate -->
+      <div>
+        <!-- <video class="my-video" src="../../../assets/02.mp4"></video> -->
+        <!-- <video id="my-player" class="my-video video-js" controls
+                    preload="auto" autoplay="autoplay" data-setup='{}'>
+                    <source src="../../../assets/02.mp4" type="video/mp4">
+                    </source>
+                  </video> -->
+      </div>
+      <div class="certificate-wrapper">
+        <h-title required text='添加证书'></h-title>
+        <div class="add">
+          <uploader @imgSrc='getImgSrc' />
+          <!-- <uploader @imgSrc='getImgSrc' title='添加证书(反面)' /> -->
+        </div>
+      </div>
+      <!-- 护理机构: nurse -->
+      <van-field required clearable v-model="user.nurse"
+        label="护理机构" placeholder="请输入护理机构" autosize />
+      <!-- 状态: status -->
+      <!-- <van-field required clearable v-model="user.status"
+                label="护理状态" placeholder="请输入状态" autosize /> -->
+      <!-- 备注: desc -->
+      <van-field clearable v-model="user.desc" label="备注"
+        placeholder="请输入备注" autosize />
       <van-button class="btn" @click='submit' size="large"
-        type="primary">提交</van-button>
+        type="primary">提交
+      </van-button>
+      <!-- <van-button class="btn" @click='testIDCard' size="large"
+        type="primary">testIDCard
+      </van-button> -->
     </van-cell-group>
   </div>
 </template>
@@ -32,37 +82,139 @@
  * 生日: birthday
  * 身份证: IDcard
  * 手机: mobile
+ * 电话: phone
+ * 邮箱: email
+ * 户籍地址: address1
+ * 居住地址: address2
+ * 通讯地址: address3
+ * 邮编: ZIPcode
+ * 证书(图片): certificate
+ * 护理机构: nurse
+ * 状态: status
+ * 备注: desc
  */
 // import { Cell, CellGroup, Field, RadioGroup, Radio } from 'vant';
 import Bscroll from 'better-scroll';
 // eslint-disable-next-line
-import { isPhone } from '@/util/index';
-import phoneComponents from '@/components/phone';
+import { testIDCard, IdCard, isEmail, isPhone, isZIPCode } from '@/util/index';
+import uploader from './uploader.vue';
+import phoneComponents from '@/components/phone.vue';
+import { addCare, getSMS, userId } from '@/util/api';
 
 export default {
   data() {
     return {
+      vPhone: '',
       user: {
         name: '',
         mobilePhone: '',
+        IDcard: '',
+        phone: '',
+        email: '',
+        address1: '',
+        address2: '',
+        address3: '',
+        ZIPcode: '',
+        certificate: '',
+        nurse: '',
+        status: '',
+        desc: '',
+      },
+      err: {
+        phone: '电话',
+        email: '邮箱',
+        address1: '户籍地址',
+        address2: '居住地址',
+        address3: '通讯地址',
+        ZIPcode: '邮编',
+        certificate: '证书',
+        nurse: '护理机构',
       },
     };
   },
+  computed: {
+    // ...mapState({
+    //   // eslint-disable-next-line
+    //   user_id: (state) => state.user_id,
+    // }),
+  },
   components: {
-    [phoneComponents.name]: phoneComponents,
+    uploader,
+    'h-phone': phoneComponents,
   },
   methods: {
     submit() {
-      console.log(this.$refs.hPhone);
-      // this.isUndefined();
+      const self = this;
+      // console.log(userId());
+      // return;
+      // 基本错误判断
+      if (self.isUndefined()) {
+        // 手机号码验证
+        if (
+          `${this.$refs.hPhone.sms.input}` === `${this.$refs.hPhone.sms.create}`
+        ) {
+          // console.log(this.$refs.hPhone.sms.input);
+          console.log(154);
+          addCare({
+            user_id: userId(),
+            name: self.user.name,
+            mobile: self.user.mobilePhone,
+            phone: self.user.phone,
+            email: self.user.email,
+            birth: IdCard(self.user.IDcard, 1),
+            sex: IdCard(self.user.IDcard, 2),
+            address1: self.user.address1,
+            address2: self.user.address2,
+            address3: self.user.address3,
+            address_number: self.user.ZIPcode,
+            card_number: self.user.IDcard,
+            certificate: self.user.certificate,
+            people: '居委会',
+            care_institutions: self.user.nurse,
+            desc: self.user.nurse,
+          }).then((res) => {
+            console.log(res);
+          });
+        }
+      }
+
+      // if (self.user.name === '') {
+      //   self.$toast.fail({
+      //     // mask: true,
+      //     forbidClick: true, // 禁用背景点击
+      //     message: '请输入姓名',
+      //   });
+      //   return;
+      // }
+      // if (self.user.mobilePhone === '') {
+      //   self.$toast.fail({
+      //     // mask: true,
+      //     forbidClick: true, // 禁用背景点击
+      //     message: '请输入手机号码',
+      //   });
+      // }
+
+      // console.log(this.$refs.hPhone.sms.input);
+      // console.log(this.$refs.hPhone.sms.create);
+      // if (this.$refs.hPhone.sms.input === this.$refs.hPhone.sms.create) {
+      //   console.log(this.$refs.hPhone.sms.input);
+      //   addCare({
+      //     user_id: self.userID,
+      //   }).then((res) => {
+      //     console.log(res);
+      //   });
+      // }
     },
     // 手机号码验证
     // eslint-disable-next-line
-    vPhone(isPhone) {
-      console.log(isPhone);
+    getCode(isPhone) {
+      this.vPhone = isPhone;
+    },
+    testIDCard() {
+      getSMS().then((res) => {
+        console.log(res);
+      });
     },
-
-    testIDCard() {},
     initScroll() {
       if (!this.scroll) {
         this.scroll = new Bscroll(this.$refs.login, {
@@ -72,13 +224,76 @@ export default {
         this.scroll.refresh();
       }
     },
-
     onClickLeft() {},
+    isUndefined() {
+      const self = this;
+      // eslint-disable-next-line
+      for (let key in self.user) {
+        if (self.user[key] === '' && key !== 'desc' && key !== 'status') {
+          // eslint-disable-next-line
+          const msg =
+            key === 'certificate'
+              ? '请添加证书照片!'
+              : `${self.err[key]}不为空!`;
+          self.$toast.fail(msg);
+          return false;
+        }
+        switch (key) {
+          case 'IDcard': {
+            const msg = testIDCard(self.user[key]);
+            if (msg !== '验证通过!') {
+              return self.$toast.fail(msg);
+            }
+            break;
+          }
+          case 'email': {
+            if (!isEmail(self.user[key])) {
+              return self.$toast.fail('邮箱格式错误!');
+            }
+            break;
+          }
+          case 'ZIPcode': {
+            const msg = isZIPCode(self.user[key]);
+            if (!msg && typeof msg !== 'boolean') {
+              return self.$toast.fail(msg);
+            }
+            break;
+          }
+          default: {
+            // self.$toast.fail('default!');
+            break;
+          }
+        }
+      }
+      return true;
+    },
+    onRead(file) {
+      const maxSize = 1024 * 1024 * 2;
+      // eslint-disable-next-line
+      console.log(file);
+      if (maxSize < file.file.size) {
+        const errorToast = this.$toast.fail({
+          duration: 0, // 持续展示 toast
+          message: '上传文件不小于2M',
+        });
+        setTimeout(() => {
+          errorToast.clear();
+        }, 3000);
+        return;
+      }
+      // eslint-disable-next-line
+      this.user.certificate.push(file.content);
+    },
+    getImgSrc(src) {
+      this.user.certificate = src;
+      console.log(this.user.certificate);
+    },
   },
 };
 </script>
 <style lang="less" scoped>
 @import '../../../assets/style/vant.less';
+
 .login-wrapper {
   padding: 46px 10px 0;
   height: 100%;
@@ -97,6 +312,7 @@ export default {
     margin: 30px auto;
   }
 }
+
 .van-button,
 .van-cell {
   font-size: @inputSize;

+ 5 - 3
www/webapp/safety/vue.config.js

@@ -3,7 +3,9 @@ const pxtorem = require('postcss-pxtorem');
 
 module.exports = {
   outputDir: 'docs',
-  baseUrl: process.env.NODE_ENV === 'production' ? '/vant-demo/' : '/',
+  baseUrl: process.env.NODE_ENV === 'production' ? '/webapp/safety/dome' : '/',
+  // where to output built files
+  outputDir: 'dome',
   css: {
     loaderOptions: {
       postcss: {
@@ -22,7 +24,7 @@ module.exports = {
     hotOnly: false,
     proxy: {
       '/moonclub': {
-        target: 'http://admin.yiguanjiadev.me/index.php?r=/moonclub', //设置调用接口域名和端口号别忘了加http
+        target: 'http://admin.yiguanjiadev.me/index.php?r=moonclub', //设置调用接口域名和端口号别忘了加http
         // target: 'http://commontest.yiguanjia.me/index.php?r=/moonclub/', //设置调用接口域名和端口号别忘了加http
         changeOrigin: true,
         pathRewrite: {
@@ -31,7 +33,7 @@ module.exports = {
         },
       },
       '/ch': {
-        target: 'http://admin.yiguanjiadev.me/index.php?r=/ch', //设置调用接口域名和端口号别忘了加http
+        target: 'http://admin.yiguanjiadev.me/index.php?r=ch', //设置调用接口域名和端口号别忘了加http
         // target: 'http://commontest.yiguanjia.me/index.php?r=/moonclub/', //设置调用接口域名和端口号别忘了加http
         changeOrigin: true,
         pathRewrite: {

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio