Browse Source

1.扫码功能完善

2.首页添加分享
remotes/origin/HEAD
wally 5 years ago
parent
commit
f111683d59
  1. 23
      main.js
  2. 5
      pages.json
  3. 141
      pages/apply-code/apply-code.vue
  4. 14
      pages/basic-info/basic-info.vue
  5. 14
      pages/healthy-card/healthy-card.vue
  6. 52
      pages/index/components/home.vue
  7. 15
      pages/index/index.vue
  8. 11
      pages/user-code/user-code.vue

23
main.js

@ -5,7 +5,15 @@ import App from './App';
import store from './store';
// 白名单页面
const whitePathList = ['basic-info', 'statistics', 'user-code'];
const whitePathList = [
'basic-info',
'statistics',
'user-code',
'sign',
'my-signs',
'my-code',
'my-trips',
];
/**
* 检查url是否在是否在白名单内
* @param {string} url path+query
@ -27,19 +35,6 @@ Vue.prototype.goHome = () => {
});
};
/**
* 打开某个页面
* @param {string} path 页面完成路径
* @param {string} query 参数字符串a=x&b=y
*/
// 白名单页面
const whiteListPath = [
'/pages/basic-info/basic-info',
'/pages/statistics/statistics',
'/pages/user-code/user-code',
];
Vue.prototype.openPage = function(path, query = '') {
let url = query ? `${path}?${query}` : path;
store.commit('user/setPagePath', url);

5
pages.json

@ -68,11 +68,6 @@
"navigationBarTitleText": "我的行程"
}
},
{
"path": "pages/healthy-card/healthy-card",
"style": {}
},
{
"path": "pages/service-agreement/service-agreement",
"style": {

141
pages/apply-code/apply-code.vue

@ -2,24 +2,40 @@
<view>
<form class="padding-lr cu-form-group flex-direction">
<view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前所在地区</view>
<view class="title padding-bottom-sm">
<span class="text-red padding-right-xs">*</span>当前所在地区
</view>
<view class="flex align-center">
<input class="flex-sub padding-left-xs" @tap="handleSelectLocation" placeholder="请选择当前所在地区" name="input" type="btn"
v-model="district" />
<input
@tap="handleSelectLocation"
class="flex-sub padding-left-xs"
name="input"
placeholder="请选择当前所在地区"
type="btn"
v-model="district"
/>
<text class="cuIcon-location timer"></text>
</view>
</view>
<view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前所在详细地址</view>
<input placeholder="请输入详细地址(含门牌号)" name="input" type="text" v-model="address" />
<view class="title padding-bottom-sm">
<span class="text-red padding-right-xs">*</span>当前所在详细地址
</view>
<input name="input" placeholder="请输入详细地址(含门牌号)" type="text" v-model="address" />
</view>
<view class="cu-form-group flex flex-direction padding-top">
<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前状态</view>
<radio-group class="block" @change="StateChange">
<view class="title padding-bottom-sm">
<span class="text-red padding-right-xs">*</span>当前状态
</view>
<radio-group @change="StateChange" class="block">
<view class="cu-list menu text-left">
<view class="cu-item" v-for="(state,index) in status" :key="index">
<view :key="index" class="cu-item" v-for="(state,index) in status">
<label class="flex justify-between align-center">
<radio class="round margin-right-xs" :checked="index === healthTypeId" :value="state.id"></radio>
<radio
:checked="index === healthTypeId"
:value="state.id"
class="round margin-right-xs"
></radio>
<view class="flex-sub" style="font-size: 34rpx;">{{ state.name }}</view>
</label>
</view>
@ -28,15 +44,19 @@
</view>
<view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm">就诊医院若无填无</view>
<input placeholder="请输入就诊医院" name="input" type="text" v-model="hospital" />
<input name="input" placeholder="请输入就诊医院" type="text" v-model="hospital" />
</view>
<view class="cu-form-group flex flex-direction padding-top">
<view class="title padding-bottom-sm">最近14天是否有武汉居住史旅游史或武汉亲戚来访</view>
<radio-group class="block" @change="TourChange">
<radio-group @change="TourChange" class="block">
<view class="flex">
<view class="flex-sub margin-tb-sm" v-for="(tour,index) in tours" :key="index">
<view :key="index" class="flex-sub margin-tb-sm" v-for="(tour,index) in tours">
<label class="flex justify-between align-center">
<radio class="round margin-right-xs" :checked="index === touchHubei" :value="tour.value"></radio>
<radio
:checked="index === touchHubei"
:value="tour.value"
class="round margin-right-xs"
></radio>
<text class="flex-sub" style="font-size: 34rpx;">{{ tour.name }}</text>
</label>
</view>
@ -46,11 +66,15 @@
<view class="cu-form-group flex flex-direction padding-top">
<view class="title padding-bottom-sm">最近14天是否有新冠肺炎患者或疑似患者接触史</view>
<radio-group class="block" @change="TouchChange">
<radio-group @change="TouchChange" class="block">
<view class="flex">
<view class="flex-sub margin-tb-sm" v-for="(touch,index) in touches" :key="index">
<view :key="index" class="flex-sub margin-tb-sm" v-for="(touch,index) in touches">
<label class="flex justify-between align-center">
<radio class="round margin-right-xs" :checked="index === touchSick" :value="touch.value"></radio>
<radio
:checked="index === touchSick"
:value="touch.value"
class="round margin-right-xs"
></radio>
<text class="flex-sub" style="font-size: 34rpx;">{{ touch.name }}</text>
</label>
</view>
@ -58,28 +82,27 @@
</radio-group>
</view>
<view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前体温</view>
<input placeholder="请输入当前真实体温" name="input" type="number" v-model="animalHeat" />
<view class="title padding-bottom-sm">
<span class="text-red padding-right-xs">*</span>当前体温
</view>
<input name="input" placeholder="请输入当前真实体温" type="number" v-model="animalHeat" />
</view>
</form>
<user-agreement @changeIntentions="changeIntentions"></user-agreement>
<button class="bg-cyan margin primary-btn" hover-class="cc-active" @tap="handleHealthSign">确认提交</button>
<button @tap="handleHealthSign" class="bg-cyan margin primary-btn" hover-class="cc-active">确认提交</button>
<!-- 历史 -->
<button class="shadow round bg-cyan history-btn iconfont icon-history" hover-class="cc-active" @tap="openPage('/pages/my-code/my-code')"></button>
<button
@tap="openPage('/pages/my-code/my-code')"
class="shadow round bg-cyan history-btn iconfont icon-history"
hover-class="cc-active"
></button>
</view>
</template>
<script>
import {
showToast
} from 'common/script/util';
import {
HEALTH_SIGN
} from 'api/api';
import {
mapState,
mapMutations
} from 'vuex';
import { showToast } from 'common/script/util';
import { HEALTH_SIGN } from 'api/api';
import { mapState, mapMutations } from 'vuex';
export default {
data() {
@ -88,20 +111,26 @@
address: '',
// status: [],
hospital: '',
tours: [{
tours: [
{
value: '0',
name: '否'
}, {
name: '否',
},
{
value: '1',
name: '是'
}],
touches: [{
name: '是',
},
],
touches: [
{
value: '0',
name: '否'
}, {
name: '否',
},
{
value: '1',
name: '是'
}],
name: '是',
},
],
animalHeat: 0,
healthTypeId: 0,
touchHubei: 0,
@ -150,7 +179,7 @@
//
TouchChange(evt) {
console.log(this.touches,'aa')
console.log(this.touches, 'aa');
for (let b = 0; b < this.touches.length; b++) {
if (this.touches[b].value === evt.target.value) {
this.touchSick = b;
@ -174,7 +203,7 @@
hospital,
token,
touchHubei,
touchSick
touchSick,
} = this;
const params = {
param: {
@ -185,31 +214,26 @@
hospital,
token,
touchHubei,
touchSick
}
touchSick,
},
};
const res = await this.$http.post(HEALTH_SIGN, params);
const {
success,
code,
msg,
data
} = res.data;
const { success, code, msg, data } = res.data;
if (success && code === 200) {
uni.showToast({
title: '申请健康码成功',
duration: 2000
duration: 2000,
});
this.success = true;
this.setHealthCode(data.healthCode)
this.setHealthCode(data.healthCode);
uni.reLaunch({
url: `/pages/index/index`,
});
} else {
uni.showToast({
title: msg || '申请健康码失败',
icon: 'none'
icon: 'none',
});
}
} catch (error) {
@ -217,7 +241,7 @@
if (error.msg) {
uni.showToast({
title: error.msg || '申请健康码失败',
icon: 'none'
icon: 'none',
});
}
}
@ -225,13 +249,7 @@
//
checkRules() {
const {
district,
address,
healthTypeId,
animalHeat,
agree
} = this;
const { district, address, healthTypeId, animalHeat, agree } = this;
if (!district || district === '请选择当前所在地区') {
showToast('请选择当前所在地区');
return;
@ -254,7 +272,6 @@
}
return true;
},
},
};
</script>

14
pages/basic-info/basic-info.vue

@ -6,7 +6,7 @@
<span class="text-red padding-right-xs" v-show="!(userInfo && userInfo.id)">*</span>姓名
</view>
<input
:disabled="(userInfo && userInfo.id) ? true : false"
:disabled="userInfo && userInfo.id ? true : false"
name="input"
placeholder="请输入真实姓名"
type="text"
@ -18,7 +18,7 @@
<span class="text-red padding-right-xs" v-show="!(userInfo && userInfo.id)">*</span>身份证
</view>
<input
:disabled="(userInfo && userInfo.id) ? true : false"
:disabled="userInfo && userInfo.id ? true : false"
name="input"
placeholder="请输入身份证号"
type="text"
@ -30,7 +30,7 @@
<span class="text-red padding-right-xs" v-show="!(userInfo && userInfo.id)">*</span>联系方式
</view>
<input
:disabled="(userInfo && userInfo.id) ? true : false"
:disabled="userInfo && userInfo.id ? true : false"
name="input"
placeholder="请输入手机号码"
type="number"
@ -68,7 +68,7 @@
<span class="text-red padding-right-xs" v-show="!(userInfo && userInfo.id)">*</span>学号
</view>
<input
:disabled="(userInfo && userInfo.id) ? true : false"
:disabled="userInfo && userInfo.id ? true : false"
name="input"
placeholder="请输入学号"
type="text"
@ -76,7 +76,7 @@
/>
</view>
</form>
<user-agreement v-if="!(userInfo && userInfo.id)" @changeIntentions="changeIntentions"></user-agreement>
<user-agreement @changeIntentions="changeIntentions" v-if="!(userInfo && userInfo.id)"></user-agreement>
<button
@tap="handleSubmitUserInfo"
class="bg-cyan margin primary-btn"
@ -167,7 +167,7 @@ export default {
if (success && code === 200) {
uni.showToast({
title: '基本信息提交成功',
duration: 2000
duration: 2000,
});
this.success = true;
this.setUserInfo(data);
@ -176,7 +176,7 @@ export default {
url: `/pages/index/index`,
});
} else {
this.openPage(pagePath);
uni.redirectTo({ url: pagePath });
}
} else {
uni.showToast({

14
pages/healthy-card/healthy-card.vue

@ -1,14 +0,0 @@
<template>
<view>扫别人的码</view>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
<style lang="scss">
</style>

52
pages/index/components/home.vue

@ -1,19 +1,29 @@
<template>
<view class="content flex flex-direction">
<view v-if="healthCode" style="position: relative;">
<image src="http://m.qpic.cn/psc?/V11kyB1O080aC1/cnQ2D7YjAZ5R6pY0fmc9joZ6fC6TxFlt9mW4UhUn2PEgUne7OUt4q4mNE.k9gU.rSr8Eu*pFToZoVwUOEGDrKMycDqdn1mLFGE1dxYTGUcE!/b&bo=7gKRAu4CkQIDWXw!&rf=viewer_4&t=5"
class="bg1"></image>
<image
src="http://m.qpic.cn/psc?/V11kyB1O080aC1/cnQ2D7YjAZ5R6pY0fmc9joZ6fC6TxFlt9mW4UhUn2PEgUne7OUt4q4mNE.k9gU.rSr8Eu*pFToZoVwUOEGDrKMycDqdn1mLFGE1dxYTGUcE!/b&bo=7gKRAu4CkQIDWXw!&rf=viewer_4&t=5"
class="bg1"
></image>
<view class="bg-code" @click="getPreviewImg(healthCode)">
<view class="healthy-code-bg shadow-lg">
<image class="healthy-code" :src="healthCode"></image>
</view>
</view>
</view>
<image v-else src="http://m.qpic.cn/psc?/V11kyB1O080aC1/cnQ2D7YjAZ5R6pY0fmc9jhx9v1rh8VuBAojvYxrYvg*uVMAXaD2En3CPiaHx7AWMjFTafVrGxwJR4jZd5s4ProhQT1ceDVquyQR7HVquBKk!/b&bo=7gLuAe4C7gEDORw!&rf=viewer_4&t=5"
class="bg"></image>
<image
v-else
src="http://m.qpic.cn/psc?/V11kyB1O080aC1/cnQ2D7YjAZ5R6pY0fmc9jhx9v1rh8VuBAojvYxrYvg*uVMAXaD2En3CPiaHx7AWMjFTafVrGxwJR4jZd5s4ProhQT1ceDVquyQR7HVquBKk!/b&bo=7gLuAe4C7gEDORw!&rf=viewer_4&t=5"
class="bg"
></image>
<view :class="healthCode ? 'box1' : 'box'">
<view v-show="!healthCode" class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/apply-code/apply-code')">
<view
@tap="openPage('/pages/apply-code/apply-code')"
class="cu-card flex margin bg-white shadow card-radius"
hover-class="cc-active"
v-show="!healthCode"
>
<view class="flex align-center padding">
<view class="round lg cu-avatar icon1">
<view class="iconfont icon-qrcode"></view>
@ -24,7 +34,11 @@
</view>
</view>
</view>
<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/punch-the-clock/punch-the-clock')">
<view
@tap="openPage('/pages/punch-the-clock/punch-the-clock')"
class="cu-card flex margin bg-white shadow card-radius"
hover-class="cc-active"
>
<view class="flex align-center padding">
<view class="round lg cu-avatar icon2">
<view class="iconfont icon-carryout"></view>
@ -35,7 +49,11 @@
</view>
</view>
</view>
<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/add-stroke/add-stroke')">
<view
@tap="openPage('/pages/add-stroke/add-stroke')"
class="cu-card flex margin bg-white shadow card-radius"
hover-class="cc-active"
>
<view class="flex align-center padding">
<view class="round lg cu-avatar icon3">
<view class="iconfont icon-car"></view>
@ -46,7 +64,11 @@
</view>
</view>
</view>
<view class="cu-card flex margin bg-white shadow card-radius" hover-class="cc-active" @tap="openPage('/pages/statistics/statistics')">
<view
@tap="openPage('/pages/statistics/statistics')"
class="cu-card flex margin bg-white shadow card-radius"
hover-class="cc-active"
>
<view class="flex align-center padding">
<view class="round lg cu-avatar icon4">
<view class="iconfont icon-linechart"></view>
@ -57,19 +79,16 @@
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import {
mapState
} from 'vuex';
import { mapState } from 'vuex';
export default {
name: 'Home',
data() {
return {}
return {};
},
computed: mapState('user', ['userInfo', 'healthCode']),
methods: {
@ -79,11 +98,10 @@
imgArr.push(image);
uni.previewImage({
urls: imgArr,
current: imgArr[0]
current: imgArr[0],
});
},
}
},
};
</script>
@ -119,8 +137,6 @@
border-radius: 6px;
}
}
}
.box {

15
pages/index/index.vue

@ -24,7 +24,14 @@ export default {
navIndex: 0,
};
},
onLoad() {},
//
onShareAppMessage() {
return {
title: '健康码小程序',
path: '/pages/index/index?scene=1008',
};
},
methods: {
/**
* 监听nav-bottom的点击事件
@ -44,8 +51,10 @@ export default {
console.log('res: ', res);
//
if (res && res.path) {
const path = `${res.path}&scan=true`;
this.openPage(res.path);
const pathArr = res.path.split('?scene=');
const query = encodeURIComponent(pathArr[1]);
const path = `/${pathArr[0]}?scene=${query}&scan=true`;
this.openPage(path);
} else {
uni.showModal({
title: '提示',

11
pages/user-code/user-code.vue

@ -42,7 +42,7 @@
</template>
<script>
import { mapActions } from 'vuex';
import { mapState, mapActions } from 'vuex';
import { formatQuery } from 'utils/util';
export default {
@ -69,6 +69,8 @@ export default {
},
computed: {
...mapState('user', ['token']),
//
post() {
if (!this.userInfo) return '学生';
@ -116,7 +118,7 @@ export default {
},
},
async onLoad(options) {
onLoad(options) {
this.init(options);
},
@ -127,7 +129,6 @@ export default {
try {
console.log('options: ', options);
const query = formatQuery(decodeURIComponent(options.scene));
console.log('query: ', query);
const { d } = query;
if (!d) {
uni.showToast({
@ -154,7 +155,11 @@ export default {
this.getUserInfoData(params);
}, 100);
} else {
console.log('params: ', params);
this.userInfo = await this.getUserInfo(params);
if (!this.userInfo.healthCodeList.length) {
showToast('健康码信息有误, 请重新生成');
}
}
},
},

Loading…
Cancel
Save