Browse Source

细节修改

remotes/origin/HEAD
songsong428 5 years ago
parent
commit
051b41992c
  1. 2
      config/api/base.js
  2. 12
      pages/add-stroke/add-stroke.vue
  3. 56
      pages/apply-code/apply-code.vue
  4. 6
      pages/basic-info/basic-info.vue
  5. 3
      pages/my-code/my-code.vue
  6. 2
      pages/my-trips/my-trips.vue
  7. 44
      pages/punch-the-clock/punch-the-clock.vue
  8. 4
      pages/user-code/user-code.vue
  9. 8
      utils/user.js

2
config/api/base.js

@ -1,5 +1,5 @@
// api基础地质 // api基础地质
export const BASE_URL = 'https://test.tall.wiki/gateway'; export const BASE_URL = 'https://www.tall.wiki/gateway';
// 错误码 // 错误码
export const ERR_CODE = 200; export const ERR_CODE = 200;

12
pages/add-stroke/add-stroke.vue

@ -23,7 +23,7 @@
</radio-group> </radio-group>
</view> </view>
<view class="cu-form-group flex flex-direction padding-top"> <view class="cu-form-group flex flex-direction padding-top">
<view class="text-xl padding-tb-sm">出行交通方式必选</view> <view class="text-xl padding-tb-sm"><span class="text-red padding-right-xs">*</span>出行交通方式</view>
<radio-group class="block" @change="RadioChange"> <radio-group class="block" @change="RadioChange">
<view class="cu-list menu text-left"> <view class="cu-list menu text-left">
<view class="cu-item" v-for="(transport,index) in transports" :key="index"> <view class="cu-item" v-for="(transport,index) in transports" :key="index">
@ -37,11 +37,11 @@
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <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>
<input placeholder="请输入" name="input" type="text" v-model="carNo" /> <input placeholder="请输入" name="input" type="text" v-model="carNo" maxlength="12"/>
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm">同行人</view> <view class="title padding-bottom-sm">同行人</view>
<input placeholder="请输入同行人" name="input" type="text" v-model="together" /> <input placeholder="请输入同行人" name="input" type="text" v-model="together" maxlength="255" />
</view> </view>
</form> </form>
<user-agreement @changeIntentions="changeIntentions" @changeIntentions1="changeIntentions1" @changeIntentions2="changeIntentions2"></user-agreement> <user-agreement @changeIntentions="changeIntentions" @changeIntentions1="changeIntentions1" @changeIntentions2="changeIntentions2"></user-agreement>
@ -67,7 +67,7 @@ export default {
transports: [ transports: [
{ {
value: '0', value: '0',
name: '铁路', name: '火车',
}, },
{ {
value: '1', value: '1',
@ -233,6 +233,10 @@ export default {
showToast('请选择抵达时间'); showToast('请选择抵达时间');
return; return;
} }
if (this.startTime >= this.endTime){
showToast('开始时间不能和抵达时间相同或者晚于抵达时间');
return;
}
if (this.journeyType<0) { if (this.journeyType<0) {
showToast('请选择行程类型'); showToast('请选择行程类型');
return; return;

56
pages/apply-code/apply-code.vue

@ -6,14 +6,8 @@
<span class="text-red padding-right-xs">*</span>当前所在地区 <span class="text-red padding-right-xs">*</span>当前所在地区
</view> </view>
<view class="flex align-center"> <view class="flex align-center">
<input <input @tap="handleSelectLocation" class="flex-sub padding-left-xs" name="input" placeholder="请选择当前所在地区" type="btn"
@tap="handleSelectLocation" v-model="district" maxlength="128" />
class="flex-sub padding-left-xs"
name="input"
placeholder="请选择当前所在地区"
type="btn"
v-model="district"
/>
<text class="cuIcon-location timer"></text> <text class="cuIcon-location timer"></text>
</view> </view>
</view> </view>
@ -21,7 +15,7 @@
<view class="title padding-bottom-sm"> <view class="title padding-bottom-sm">
<span class="text-red padding-right-xs">*</span>当前所在详细地址 <span class="text-red padding-right-xs">*</span>当前所在详细地址
</view> </view>
<input name="input" placeholder="请输入详细地址(含门牌号)" type="text" v-model="address" /> <input name="input" placeholder="请输入详细地址(含门牌号)" type="text" v-model="address" maxlength="128" />
</view> </view>
<view class="cu-form-group flex flex-direction padding-top"> <view class="cu-form-group flex flex-direction padding-top">
<view class="title padding-bottom-sm"> <view class="title padding-bottom-sm">
@ -31,11 +25,7 @@
<view class="cu-list menu text-left"> <view class="cu-list menu text-left">
<view :key="index" class="cu-item" v-for="(state,index) in status"> <view :key="index" class="cu-item" v-for="(state,index) in status">
<label class="flex justify-between align-center"> <label class="flex justify-between align-center">
<radio <radio :checked="index === healthTypeId" :value="state.id" class="round margin-right-xs"></radio>
:checked="index === healthTypeId"
:value="state.id"
class="round margin-right-xs"
></radio>
<view class="flex-sub" style="font-size: 34rpx;">{{ state.name }}</view> <view class="flex-sub" style="font-size: 34rpx;">{{ state.name }}</view>
</label> </label>
</view> </view>
@ -44,7 +34,7 @@
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm">就诊医院若无填无</view> <view class="title padding-bottom-sm">就诊医院若无填无</view>
<input name="input" placeholder="请输入就诊医院" type="text" v-model="hospital" /> <input name="input" placeholder="请输入就诊医院" type="text" v-model="hospital" maxlength="32" />
</view> </view>
<view class="cu-form-group flex flex-direction padding-top"> <view class="cu-form-group flex flex-direction padding-top">
<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>最近14天是否有武汉居住史旅游史或武汉亲戚来访</view> <view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>最近14天是否有武汉居住史旅游史或武汉亲戚来访</view>
@ -52,11 +42,7 @@
<view class="flex"> <view class="flex">
<view :key="index" class="flex-sub margin-tb-sm" v-for="(tour,index) in tours"> <view :key="index" class="flex-sub margin-tb-sm" v-for="(tour,index) in tours">
<label class="flex justify-between align-center"> <label class="flex justify-between align-center">
<radio <radio :checked="index === touchHubei" :value="tour.value" class="round margin-right-xs"></radio>
:checked="index === touchHubei"
:value="tour.value"
class="round margin-right-xs"
></radio>
<text class="flex-sub" style="font-size: 34rpx;">{{ tour.name }}</text> <text class="flex-sub" style="font-size: 34rpx;">{{ tour.name }}</text>
</label> </label>
</view> </view>
@ -70,11 +56,7 @@
<view class="flex"> <view class="flex">
<view :key="index" class="flex-sub margin-tb-sm" v-for="(touch,index) in touches"> <view :key="index" class="flex-sub margin-tb-sm" v-for="(touch,index) in touches">
<label class="flex justify-between align-center"> <label class="flex justify-between align-center">
<radio <radio :checked="index === touchSick" :value="touch.value" class="round margin-right-xs"></radio>
:checked="index === touchSick"
:value="touch.value"
class="round margin-right-xs"
></radio>
<text class="flex-sub" style="font-size: 34rpx;">{{ touch.name }}</text> <text class="flex-sub" style="font-size: 34rpx;">{{ touch.name }}</text>
</label> </label>
</view> </view>
@ -111,23 +93,21 @@
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm"> <view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>当前体温</view>
<span class="text-red padding-right-xs">*</span>当前体温 <input placeholder="请输入当前体温" name="input" type="digit" v-model="animalHeat" />
</view>
<input name="input" placeholder="请输入当前真实体温" type="digit" v-model="animalHeat" />
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <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"> <view class="flex">
<input placeholder="姓名" class="flex flex-sub" name="input" type="text" v-model="emergencyName"/> <input placeholder="姓名" maxlength="6" class="flex flex-sub" name="input" type="text" v-model="emergencyName" />
<input placeholder="联系方式" class="flex flex-sub" name="input" type="number" v-model="emergencyPhone"/> <input placeholder="联系方式" maxlength="11" class="flex flex-sub" name="input" type="number" v-model="emergencyPhone" />
</view> </view>
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm">备注选填</view> <view class="title padding-bottom-sm">备注选填</view>
<textarea placeholder="请填写具体情况..." name="input" v-model="remark"/> <textarea placeholder="请填写具体情况..." name="input" v-model="remark" />
<!-- 上传图片 --> <!-- 上传图片 -->
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
@ -295,9 +275,9 @@ export default {
ChooseImage() { ChooseImage() {
uni.chooseImage({ uni.chooseImage({
count: 9, //9 count: 1, //9
sizeType: ['original', 'compressed'], // sizeType: ['original', 'compressed'], //
sourceType: ['album'], // sourceType: ['album', 'camera'], //
success: (res) => { success: (res) => {
if (this.imgList.length != 0) { if (this.imgList.length != 0) {
this.imgList = this.imgList.concat(res.tempFilePaths) this.imgList = this.imgList.concat(res.tempFilePaths)
@ -305,7 +285,7 @@ export default {
this.imgList = res.tempFilePaths this.imgList = res.tempFilePaths
} }
uni.uploadFile({ uni.uploadFile({
url: `https://test.tall.wiki/gateway${HEALTH_FILE}`, url: `https://www.tall.wiki/gateway${HEALTH_FILE}`,
filePath: res.tempFilePaths[0], filePath: res.tempFilePaths[0],
fileType: 'image', fileType: 'image',
name: 'file', name: 'file',
@ -322,7 +302,9 @@ export default {
title: '图片提交成功', title: '图片提交成功',
duration: 1000, duration: 1000,
}); });
console.log(this.fileIdList);
},fail: (err) => { },fail: (err) => {
console.log('uploadImage fail', err);
uni.showModal({ uni.showModal({
content: err.errMsg, content: err.errMsg,
showCancel: false showCancel: false
@ -442,8 +424,8 @@ export default {
showToast('请选择状态'); showToast('请选择状态');
return; return;
} }
if (!animalHeat) { if (!animalHeat || animalHeat<30 || animalHeat>45) {
showToast('请输入当前体温'); showToast('请输入正确的体温值(范围:30℃~45℃)');
return; return;
} }
if (!emergencyName) { if (!emergencyName) {

6
pages/basic-info/basic-info.vue

@ -11,6 +11,7 @@
placeholder="请输入真实姓名" placeholder="请输入真实姓名"
type="text" type="text"
v-model="name" v-model="name"
maxlength="6"
/> />
</view> </view>
<!-- <view class="cu-form-group flex flex-direction padding-tb"> <!-- <view class="cu-form-group flex flex-direction padding-tb">
@ -23,6 +24,7 @@
placeholder="请输入身份证号" placeholder="请输入身份证号"
type="idcard" type="idcard"
v-model="idCard" v-model="idCard"
maxlength="18"
/> />
</view> --> </view> -->
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
@ -35,6 +37,7 @@
placeholder="请输入手机号码" placeholder="请输入手机号码"
type="number" type="number"
v-model="phone" v-model="phone"
maxlength="11"
/> />
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
@ -73,11 +76,12 @@
placeholder="请输入学号/工号" placeholder="请输入学号/工号"
type="text" type="text"
v-model="studentID" v-model="studentID"
maxlength="16"
/> />
</view> </view>
</form> </form>
<user-agreement @changeIntentions="changeIntentions" @changeIntentions1="changeIntentions1" @changeIntentions2="changeIntentions2" v-if="!(userInfo && userInfo.id)"></user-agreement> <user-agreement @changeIntentions="changeIntentions" @changeIntentions1="changeIntentions1" @changeIntentions2="changeIntentions2" v-if="!(userInfo && userInfo.id)"></user-agreement>
<view class="flex text-df margin-bottom margin-lr agree-text"> <view v-if="!(userInfo && userInfo.id)" class="flex text-df margin-bottom margin-lr agree-text">
微信小程序和企业微信应用同时实名后可以绑定微信小程序帐号和企业微信应用帐号方便操作 微信小程序和企业微信应用同时实名后可以绑定微信小程序帐号和企业微信应用帐号方便操作
</view> </view>

3
pages/my-code/my-code.vue

@ -42,7 +42,7 @@
<view class="margin-top" v-show="item.remark || item.filePath.length > 0"> <view class="margin-top" v-show="item.remark || item.filePath.length > 0">
备注:{{ item.remark }} 备注:{{ item.remark }}
<view class="margin-top"> <view class="margin-top">
<image @tap="viewImage(item.filePath,index)" :key="index" v-for="(file,index) in item.filePath" :src="file" style="width: 69px;height: 75px;" class="margin-lr-xs"></image> <image @tap="viewImage(item.filePath,i)" :key="i" v-for="(file,i) in item.filePath" :src="file" style="width: 69px;height: 75px;" class="margin-lr-xs"></image>
</view> </view>
</view> </view>
</view> </view>
@ -136,7 +136,6 @@
// //
viewImage(filePath,index) { viewImage(filePath,index) {
console.log(filePath,index)
if(filePath && filePath.length > 0){ if(filePath && filePath.length > 0){
uni.previewImage({ uni.previewImage({
urls: filePath, urls: filePath,

2
pages/my-trips/my-trips.vue

@ -59,7 +59,7 @@
tableList: [], tableList: [],
transports: [{ transports: [{
value: 0, value: 0,
name: '铁路', name: '火车',
}, },
{ {
value: 1, value: 1,

44
pages/punch-the-clock/punch-the-clock.vue

@ -2,24 +2,30 @@
<view> <view>
<form class="padding-lr cu-form-group flex-direction"> <form class="padding-lr cu-form-group flex-direction">
<view class="cu-form-group flex flex-direction padding-tb"> <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"> <view class="flex align-center">
<input class="flex-sub padding-left-xs" @tap="handleSelectLocation" placeholder="请选择当前所在地区" name="input" type="btn" <input @tap="handleSelectLocation" class="flex-sub padding-left-xs" name="input" placeholder="请选择当前所在地区" type="btn"
v-model="district" /> v-model="district" maxlength="128" />
<text class="cuIcon-location timer"></text> <text class="cuIcon-location timer"></text>
</view> </view>
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <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">
<input placeholder="请输入详细地址(含门牌号)" name="input" type="text" v-model="address" /> <span class="text-red padding-right-xs">*</span>当前所在详细地址
</view>
<input name="input" placeholder="请输入详细地址(含门牌号)" type="text" v-model="address" maxlength="128" />
</view> </view>
<view class="cu-form-group flex flex-direction padding-top"> <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> <view class="title padding-bottom-sm">
<radio-group class="block" @change="StateChange"> <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-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"> <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> <view class="flex-sub" style="font-size: 34rpx;">{{ state.name }}</view>
</label> </label>
</view> </view>
@ -28,7 +34,7 @@
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm">就诊医院若无填无</view> <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" maxlength="32" />
</view> </view>
<view class="cu-form-group flex flex-direction padding-top"> <view class="cu-form-group flex flex-direction padding-top">
<view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>最近14天是否有武汉居住史旅游史或武汉亲戚来访</view> <view class="title padding-bottom-sm"><span class="text-red padding-right-xs">*</span>最近14天是否有武汉居住史旅游史或武汉亲戚来访</view>
@ -88,20 +94,20 @@
<view class="cu-form-group flex flex-direction padding-tb"> <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>
<input placeholder="请输入当前真实体温" name="input" type="digit" v-model="animalHeat"/> <input placeholder="请输入当前体温" name="input" type="digit" v-model="animalHeat" />
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <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"> <view class="flex">
<input placeholder="姓名" class="flex flex-sub" name="input" type="text" v-model="emergencyName"/> <input placeholder="姓名" maxlength="6" class="flex flex-sub" name="input" type="text" v-model="emergencyName" />
<input placeholder="联系方式" class="flex flex-sub" name="input" type="number" v-model="emergencyPhone"/> <input placeholder="联系方式" maxlength="11" class="flex flex-sub" name="input" type="number" v-model="emergencyPhone" />
</view> </view>
</view> </view>
<view class="cu-form-group flex flex-direction padding-tb"> <view class="cu-form-group flex flex-direction padding-tb">
<view class="title padding-bottom-sm">备注选填</view> <view class="title padding-bottom-sm">备注选填</view>
<textarea placeholder="请填写具体情况..." name="input" v-model="remark"/> <textarea placeholder="请填写具体情况..." name="input" v-model="remark" />
<!-- 上传图片 --> <!-- 上传图片 -->
<view class="grid col-4 grid-square flex-sub"> <view class="grid col-4 grid-square flex-sub">
@ -265,9 +271,9 @@
ChooseImage() { ChooseImage() {
uni.chooseImage({ uni.chooseImage({
count: 9, //9 count: 1, //9
sizeType: ['original', 'compressed'], // sizeType: ['original', 'compressed'], //
sourceType: ['album'], // sourceType: ['album', 'camera'], //
success: (res) => { success: (res) => {
if (this.imgList.length != 0) { if (this.imgList.length != 0) {
this.imgList = this.imgList.concat(res.tempFilePaths) this.imgList = this.imgList.concat(res.tempFilePaths)
@ -275,7 +281,7 @@
this.imgList = res.tempFilePaths this.imgList = res.tempFilePaths
} }
uni.uploadFile({ uni.uploadFile({
url: `https://test.tall.wiki/gateway${HEALTH_FILE}`, url: `https://www.tall.wiki/gateway${HEALTH_FILE}`,
filePath: res.tempFilePaths[0], filePath: res.tempFilePaths[0],
fileType: 'image', fileType: 'image',
name: 'file', name: 'file',
@ -429,8 +435,8 @@
showToast('请选择状态'); showToast('请选择状态');
return; return;
} }
if (!animalHeat) { if (!animalHeat || animalHeat<30 || animalHeat>45) {
showToast('请输入当前体温'); showToast('请输入正确的体温值(范围:30℃~45℃)');
return; return;
} }
if (!emergencyName) { if (!emergencyName) {

4
pages/user-code/user-code.vue

@ -8,10 +8,10 @@
<text class="margin-right">{{ userInfo.name }}</text> <text class="margin-right">{{ userInfo.name }}</text>
<text>{{ post }}</text> <text>{{ post }}</text>
</view> </view>
<view class="text-lg text-grey"> <!-- <view class="text-lg text-grey">
身份证 身份证
<text>{{ userInfo.idCard }}</text> <text>{{ userInfo.idCard }}</text>
</view> </view> -->
<view class="text-lg text-grey"> <view class="text-lg text-grey">
手机号 手机号
<text>{{ userInfo.phone }}</text> <text>{{ userInfo.phone }}</text>

8
utils/user.js

@ -54,8 +54,8 @@ export const wxLogin = () => {
client: SIGN_IN_CLIENTS['mp'], client: SIGN_IN_CLIENTS['mp'],
type: SIGN_IN_TYPES['mp'], type: SIGN_IN_TYPES['mp'],
data: { identifier: response.code, credential: 'health' }, data: { identifier: response.code, credential: 'health' },
redirect: 'https://test.tall.wiki/gateway/health/initMsg', // redirect: 'https://test.tall.wiki/gateway/health/initMsg',
// redirect: 'https://www.tall.wiki/gateway/health/initMsg', redirect: 'https://www.tall.wiki/gateway/health/initMsg',
}; };
resolve(params); resolve(params);
} else { } else {
@ -81,8 +81,8 @@ export const wxWorkLogin = () => {
client: SIGN_IN_CLIENTS['wx_work'], client: SIGN_IN_CLIENTS['wx_work'],
type: SIGN_IN_TYPES['wx_work'], type: SIGN_IN_TYPES['wx_work'],
data: { identifier: response.code, credential: 'health' }, data: { identifier: response.code, credential: 'health' },
redirect: 'https://test.tall.wiki/gateway/health/initMsg', // redirect: 'https://test.tall.wiki/gateway/health/initMsg',
// redirect: 'https://www.tall.wiki/gateway/health/initMsg', redirect: 'https://www.tall.wiki/gateway/health/initMsg',
}; };
resolve(params); resolve(params);
} else { } else {

Loading…
Cancel
Save