提交 dc581441 编写于 作者: 张磊's avatar 张磊

Merge branch 'feature/zl' into 'release'

Feature/zl

See merge request !184
#!/bin/bash
hasGit=`which git` # 判断是否存在git
msg=${1:-'auto commit'} # 获取终端输入的第一个参数,若为空则为auto commit
if [ ! $hasGit ];then
echo 'Please download git first!';
exit 1;
else
current_id=`git log -n 15 develop --pretty=format:"%H"`
current_id2=`git log -n 15 origin/develop --pretty=format:"%H"`
echo "local: $current_id "+"----"+" $current_id2"
fi
#!/bin/bash
hasGit=`which git` # 判断是否存在git
msg=${1:-'auto commit'} # 获取终端输入的第一个参数,若为空则为auto commit
originBranch='origin/develop'
if [ ! $hasGit ];then
echo 'Please download git first!';
exit 1;
else
git remote update
git fetch --all
result=`git symbolic-ref --short -q HEAD` # 获取分支名
current_id=`git log -n 1 origin/release --pretty=format:"%H"`
git reset --soft $current_id
git add .
git commit -m "$msg"
echo "curBranch $result"
git push -f origin $result # 提交代码到github(修改了远程项目名)
fi
diff=`git diff $result $originBranch | grep -i ">>>>>>"`
empty=""
if test $diff -eq $empty
then
current_id=`git log -n 1 $originBranch --pretty=format:"%H"`
echo "没有冲突,继续"
echo "远程目标分支: $originBranch "
echo "远程目标分支最新commit: $current_id"
git reset --soft $current_id
git add .
git commit -m "$msg"
git push origin --force-with-lease $result # 提交代码到github(修改了远程项目名)
else
git add .
git commit -m "auto commit"
git push origin $result
echo "本地分支和origin/release存在冲突"
echo "result: $result $diff"
fi
fi
\ No newline at end of file
......@@ -65,3 +65,13 @@ export const getCheckInUserInfo = async(data) => {
withCredentials: true,
});
};
// /tis/insurance / save / order / detection / result
export const saveOrder = async(data) => {
return request({
method: 'post',
data,
url: '/tis/insurance/save/order/detection/result',
withCredentials: true,
});
};
......@@ -42,6 +42,14 @@ export const getTypeCodeList = () => {
withCredentials: true,
});
};
export const getTypeCodeListDemo = () => {
return request({
url: 'basic-data/constants/app?typeCodeList=P332',
method: 'get',
withCredentials: true,
});
};
// 跟进报告提交
// /trade/detection/record/operation/submit
......
......@@ -112,9 +112,11 @@ export default {
// 获取机构列表
getScheduling() {
const {projectEquityNo, hospitalId} = this;
getScheduling({ projectEquityNo, hospitalId }).then(res => {
this.timsArray = res.data;
});
if(projectEquityNo && hospitalId) {
getScheduling({ projectEquityNo, hospitalId }).then(res => {
this.timsArray = res.data;
});
}
},
selectItem() {
if (this.selectTimes === '') {
......
import Vue from 'vue';
import picaGuideApp from '@pica-kit/pica-ui-component/lib/pica-guide-app';
import PageModel from '@pica-kit/page-model';
import { Dialog, Field, Overlay, Button, Popup, Icon} from 'vant';
import { Dialog, Field, Overlay, Button, Popup, Icon, RadioGroup, Radio} from 'vant';
import Loading from '@/components/loading/loading';
......@@ -14,3 +14,5 @@ Vue.use(Overlay);
Vue.use(Button);
Vue.use(Popup);
Vue.use(Icon);
Vue.use(RadioGroup);
Vue.use(Radio);
......@@ -37,6 +37,14 @@ const routerConfig = [
title: '快检详情',
},
},
{
path: '/insuranceDetectionDetailDemo',
name: 'insuranceQuickDetectionDetailDemo',
component: () => import('@/views/insurance-Detection-detail-demo/index'),
meta: {
title: '检测详情',
},
},
{
path: '/insuranceQuestionResult',
name: 'insuranceQuestionResult',
......@@ -45,6 +53,14 @@ const routerConfig = [
title: '问卷结果页面',
},
},
{
path: '/insuranceQuestionResultPay',
name: 'insuranceQuestionResultPay',
component: () => import('@/views/insurance-question-result-pay/insuranceQuestionResult.vue'),
meta: {
title: '问卷结果页面',
},
},
{
path: '/insuranceQuestionBack',
name: 'insuranceQuestionBack',
......@@ -58,6 +74,14 @@ const routerConfig = [
title: '预约',
},
},
{
path: '/appoint-demo',
name: 'appointDemo',
component: () => import('@/views/appoint-demo/index.vue'),
meta: {
title: '癌症早筛检测预约',
},
},
{
path: '/home',
name: 'home',
......@@ -92,6 +116,11 @@ const routerConfig = [
name: 'insuranceregistersuccess',
component: () => import('@/views/insurance-register/register-success.vue'),
},
{
path: '/sz-home',
name: 'sz-home',
component: () => import('@/views/sz-home/index.vue'),
},
];
// // 无问卷-0001 有问卷未填写-0101 已填写问卷未出结果-0102 已出结果无需领用-0401 已出结果未预约-0201 已预约未采样-0301 已预约已采样-0302
// const routerMap = {
......
import Cookies from 'js-cookie';
const VUE_APP_ENV = process.env.VUE_APP_ENV;
const VUE_APP_DOMAIN = process.env.VUE_APP_DOMAIN;
const localDomain = VUE_APP_ENV === 'development' ? window.location.hostname : VUE_APP_DOMAIN;
export const setCookie = (
cname,
cvalue,
params = {
path: '/',
expires: 7,
domain: localDomain,
},
) => {
delCookie(cname);
Cookies.set(cname, cvalue, params);
};
export const getCookie = (
cname,
params = { path: '/', domain: localDomain },
) => {
const data = Cookies.get(cname, params);
return data;
};
export const delCookie = (cname) => {
Cookies.remove(cname, {
path: '/',
domain: localDomain,
});
Cookies.remove(cname, {
path: '/',
domain: '.yunqueyi.com',
});
Cookies.remove(cname, {
path: '/',
});
};
import * as cookieFun from './cookieFun';
export const setCookie = cookieFun.setCookie;
export const getCookie = cookieFun.getCookie;
export const delCookie = cookieFun.delCookie;
export const formatDate = (datetime) => {
var date = new Date(datetime); // 时间戳为10位需*1000,时间戳为13位的话不需乘1000
var year = date.getFullYear(),
......
此差异已折叠。
......@@ -57,9 +57,9 @@ export default {
web_data:{projectEquityNo: projectEquityNo, externalOrderNo: n},
});
this.initMap(data);
}
if (this.query.referer) {
this.$loading.show();
const url = this.query.referer;
const yunOrderNo = url.split('@@')[1];
console.log('this.query.referer', yunOrderNo);
......@@ -73,7 +73,11 @@ export default {
component_tag: '7802854#0#0#中转页',
web_data:{yunOrderNo: yunOrderNo},
});
this.initMap(data);
const that = this;
setTimeout(function () {
that.initMap(data);
}, 2000);
}
},
......@@ -151,7 +155,11 @@ export default {
if (this.hasQuestionnaire) {
this.query.needDetect = 1;
console.log('this.query.needDetect', this.query);
this.turnToPage('/insuranceQuestionResult', this.query);
// 是否付费
// payFlag "付费免费标识 -1未出结果 0无推荐 1免费 2付费
const {payFlag} = res.data;
const path = (payFlag && payFlag == 2) ? '/insuranceQuestionResultPay' : '/insuranceQuestionResult';
this.turnToPage(path, this.query);
} else {
this.turnToPage('/appoint', this.query);
}
......
.insurance-quickDetection-detail-demo {
background-color: #f5f6f8;
padding-top: 10px;
min-height: 100vh;
width: 100%;
position: relative;
.title {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 260px;
background: linear-gradient(180deg, #00bda5 0%, #20c5b0 52%, #f5f6f8 100%);
}
.detail-box {
padding: 0 12px;
height: auto;
padding-bottom: 10px;
position: relative;
z-index: 1;
.status {
padding: 16px 0;
display: flex;
align-items: center;
img {
width: 27px;
}
div {
padding-left: 9px;
width: 120px;
height: 20px;
font-size: 20px;
font-weight: 500;
color: #ffffff;
line-height: 20px;
}
}
.content {
height: auto;
.info {
width: 100%;
height: auto;
background: #ffffff;
border-radius: 10px;
margin-bottom: 10px;
padding-top: 20px;
.list {
padding: 0px 15px 12px 15px;
display: flex;
justify-content: flex-start;
align-items: center;
.l-left {
width: 72px;
height: 14px;
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 14px;
}
.l-right {
padding-left: 2px;
width: auto;
height: auto;
font-size: 14px;
font-weight: 600;
color: #212121;
flex: 1;
line-height: 20px;
text-align: right;
span {
display: inline-block;
padding-left: 15px;
}
}
}
.list-bottom {
.l-b-code {
.l-b-list {
display: flex;
justify-content: flex-start;
align-items: center;
padding-bottom: 13px;
.l-left {
width: auto;
height: 15px;
font-size: 15px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #212121;
line-height: 15px;
}
.l-right {
padding-left: 6px;
height: 15px;
font-size: 15px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #00bda5;
line-height: 15px;
}
}
}
}
}
.flow {
padding: 20px;
height: auto;
background: #ffffff;
border-radius: 10px;
.express-step {
display: flex;
padding-bottom: 24px;
position: relative;
justify-content: flex-start;
.express-step-icon {
width: 18px;
height: 18px;
margin-right: 7px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
z-index: 2;
.step-pg {
margin-left: -11px;
display: block;
width: 18px;
height: auto;
}
.oval-pg {
display: block;
width: 6px;
height: 6px;
}
}
.express-step-msg {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.step-title {
height: 18px;
font-size: 14px;
font-weight: 700;
color: #999999;
line-height: 18px;
}
.step-time {
margin-top: 5px;
font-size: 12px;
font-weight: 400;
color: #999999;
line-height: 12px;
}
}
.noButton {
margin-left: 22px;
}
&::before {
content: '';
position: absolute;
top: 0;
left: -5px;
display: block;
width: 15px;
height: 15px;
border-radius: 50%;
border:1px solid #e7e7e7;
background-color: #ffffff;
z-index: 1;
}
&::after {
content: '';
position: absolute;
top: 11px;
bottom: 0;
height: calc(100% - 5px);
left: 3px;
display: block;
width: 1px;
background: #e7e7e7;
}
&.first {
&::before {
display: none;
}
}
&.last {
padding-bottom: 0;
&::after {
display: none;
}
}
}
.isComplate {
&::after {
background: #00bda5;
}
&::before {
background: #00bda5;
}
.express-step-msg {
.step-title {
color: #212121;
}
}
}
.hideCircle {
&::before {
width: 0;
display: none;
}
.express-step-msg {
.step-title {
color: #212121;
}
}
}
}
.tips{
color: #FF4B33;
font-size: 12px;
font-weight: lighter;
margin-top: 10px;
margin-left: 20px;
}
}
.flex-wrap{
display: flex;
font-size: 16px;
align-items: center;
height: 21px;
}
.fc-blue{
color: #00BDA5;
}
.p30{
padding: 15px;
background-color: #ffffff;
border-radius: 10px;
margin-bottom: 10px;
}
.l-copy {
text-align: center;
border-radius: 10px;
font-size: 12px;
font-weight: 500;
color: #1677FE;
line-height: 22px;
margin-left: 6px;
margin-top: -2px;
display: inline-block;
}
}
.pb60{
padding-bottom: 60px;
}
.submit-container {
box-sizing: border-box;
position: fixed;
bottom: 0;
left: 0;
width: 100%;
z-index: 99;
padding: 5px 12px;
padding-bottom: calc(5px + env(safe-area-inset-bottom) / 2);
background: #ffffff;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.submit-button {
position: relative;
width: 350px;
height: 40px;
border-radius: 20px;
font-weight: 700;
color: #ffffff;
font-size: 16px;
display: flex;
align-items: center;
background: #00bda5;
justify-content: center;
}
.submit-button-empty{
background: #ffffff;
border: 1px solid #00bda5;
color: #00bda5;
}
}
.multi-sub-wrap{
flex-direction: row;
justify-content: space-evenly;
.submit-button{
width: 45%;
}
}
}
.choose-result{
padding: 20px 15px;
background: #ffffff;
border-radius: 11px;
.result-title{
height: 18px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #212121;
line-height: 18px;
margin-bottom: 14px;
}
.result-tips{
display: flex;
justify-content: space-between;
align-items: center;
width: 300px;
height: 32px;
padding: 0 10px;
background: #FFFBE7;
border-radius: 2px;
font-size:13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #FF720C;
line-height: 32px;
margin-bottom: 20px;
.tips-right{
width: 73px;
height: 21px;
border-radius: 11px;
border: 1px solid #FF720C;
line-height: 21px;
text-align: center;
}
}
.result-radio{
margin-bottom: 20px;
}
.radio-name{
height: 14px;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #212121;
line-height: 14px;
}
.result-list-img{
display: flex;
.img-item{
width: 75px;
height: 75px;
border-radius: 4px;
margin-right: 7px;
/deep/.van-image__img{
border-radius: 4px;
}
}
.list-img-item{
position: relative;
}
.close-btn{
position: absolute;
z-index: 2;
right: 0;
top: 0;
width: 15px;
transform: translate(-3px,-3px);
height: 15px;
background: url('~@/assets/images/close.png') 0 0 / 100%
}
}
}
.result-list-tips{
.list-tips-item{
font-size: 13px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #999999;
line-height: 18px;
margin-bottom:9px ;
span{
color: #1677FE;
margin-left: 4px;
}
}
}
/deep/ .van-radio__icon--checked .van-icon{
background: #00bda5;
border-color: #00bda5;
}
此差异已折叠。
......@@ -428,21 +428,33 @@ export default {
if (res.code !== '000000') {
return this.$toast(res.message);
} else {
this.$router.push(
{
path: '/insuranceBindCodeSuccess',
query: {
yunOrderNo: this.yunOrderNo,
detectionRecordId: this.detectionRecordId
},
}
);
const { projectEquityNo } = this.insuranceInfo;
if(projectEquityNo == 'SZ202305031000597601') {
this.$router.push(
{
path: '/insuranceDetectionDetailDemo',
query: {
yunOrderNo: this.yunOrderNo,
detectionRecordId: this.detectionRecordId
},
}
);
}else {
this.$router.push(
{
path: '/insuranceBindCodeSuccess',
query: {
yunOrderNo: this.yunOrderNo,
detectionRecordId: this.detectionRecordId
},
}
);
}
this.$toast('提交成功');
}
});
},
earlyBindingCode(obj) {
// quickBindingCode userId
const o = {...obj, detectionKind: 0};
bindingSampleCode(o).then(res => {
if (res.code !== '000000') {
......
......@@ -154,13 +154,15 @@ export default {
component_tag: '7802847#0#0#查看我的检测',
web_data:{yunOrderNo: this.yunOrderNo},
});
this.$router.push({
path: url,
query: {
detectionRecordId: this.detectionRecordId,
yunOrderNo: this.yunOrderNo
},
});
const u = window.location.origin + '/pica-insurance' + url + `?detectionRecordId=${this.detectionRecordId}&yunOrderNo=${this.yunOrderNo}`;
window.location.href = u;
// this.$router.push({
// path: url,
// query: {
// detectionRecordId: this.detectionRecordId,
// yunOrderNo: this.yunOrderNo
// },
// });
},
copyText(item) {
const input = document.createElement('input');
......
......@@ -283,9 +283,9 @@
justify-content: center;
}
.submit-button-empty{
background: #ffffff;
//background: #ffffff;
border: 1px solid #00bda5;
color: #00bda5;
color: #ffffff;
position: relative;
}
}
......@@ -294,6 +294,7 @@
justify-content: space-evenly;
.submit-button{
padding: 0px 20px;
min-width: 60px;
}
.btn-label{
width: 62px;
......
......@@ -170,6 +170,7 @@
:username="openWebAppConfig.username"
:path="openWebAppConfig.path"
:extra-data="openWebAppConfig.extraData"
:env-version="envVersion"
>
<script type="text/wxtag-template">
<style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ openWebAppBtnName }}</div>
......@@ -198,9 +199,10 @@
style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
:username="openWebAppConfigPositive.username"
:path="openWebAppConfigPositive.path"
:env-version="envVersion"
>
<script type="text/wxtag-template">
<style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">{{ openWebAppBtnName }}</div>
<style>.btn {position:absolute; top: 0; color: #ffffff;text-align: center;line-height: 40px; left: 0; width:100%; height: 100%;}</style> <div class="btn">阳性报销</div>
</script>
</wx-open-launch-weapp>
</div>
......@@ -222,6 +224,7 @@
</template>
<script>
import { getDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
const { VUE_APP_ENV } = process.env;
// 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
export default {
filters: {
......@@ -255,6 +258,7 @@ export default {
},
data() {
return {
envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
picaWechat:window._picaWechat,
status: '',
headerInfo: {
......@@ -289,6 +293,7 @@ export default {
this.init();
},
mounted() {
console.log('--VUE_APP_ENV', VUE_APP_ENV);
this.$sendBuriedData({
action: 'ACTION_WEB_AFTER',
component_tag: '7802848#0#0#检测详情页面',
......@@ -316,7 +321,6 @@ export default {
const {inquiryStatus} = res.data;
let n = '';
if(inquiryStatus == 0) {
// ed.targetPath = '/pages/consultation-info/consultation/index';
this.action_code = 'bottomBtnFun2';
jump_path = jump_path + '&action_code=bottomBtnFun2';
n = '报告解读';
......@@ -334,7 +338,8 @@ export default {
that.openWebAppConfig.extraData = JSON.stringify(ed);
that.openWebAppBtnName = n;
that.openWebAppConfig.path = jump_path;
this.openWebAppConfigPositive = `pagesInsurance/all-entrance/index?detectionKind=${this.dataDetail.id}&tradeDetectionServiceRecordId=${this.dataDetail.detectType}`;
this.openWebAppConfigPositive.path = `pagesInsurance/all-entrance/index?detectionKind=0&tradeDetectionServiceRecordId=${this.dataDetail.detectionRecordId}`;
console.log('-that.openWebAppConfig.', that.openWebAppConfig, that.openWebAppConfigPositive, that.openWebAppBtnName);
} else {
that.$toast(res.message);
}
......@@ -410,7 +415,7 @@ export default {
if(this.picaWechat == 'wechat') {
return false;
}
const query = `detectionKind=${this.dataDetail.id}&tradeDetectionServiceRecordId=${this.dataDetail.detectType}`;
const query = `detectionKind=0&tradeDetectionServiceRecordId=${this.dataDetail.detectionRecordId}`;
const p = {params:{path:'pagesInsurance/all-entrance/index', query:query}, type: 2};
getJumpToWebapp(p).then(res => {
console.log('--res', res);
......
......@@ -125,14 +125,14 @@
class="submit-container multi-sub-wrap"
>
<div
v-if="false"
v-if="picaWechat == 'wechat'"
class="submit-button"
>
<wx-open-launch-weapp
style="position: absolute; top: 0; left: 0; width: 100%; height: 100%"
:username="openWebAppConfig.username"
:path="openWebAppConfig.path"
env-version="trial"
:env-version="envVersion"
:extra-data="openWebAppConfig.extraData"
>
<script type="text/wxtag-template">
......@@ -151,6 +151,7 @@
</div>
</template>
<script>
const { VUE_APP_ENV } = process.env;
import { getQuickDetectionDetailProces, getJumpToWebapp, detectionRecordInfo } from '@/api/detection';
// 0待完善信息、1待采样、2已采样、21已送检、22快递已签收、 25实验室已收样、 27已上机、 3已完成、5样本失效、 6待支付
export default {
......@@ -177,6 +178,7 @@ export default {
},
data() {
return {
envVersion: VUE_APP_ENV == 'production' ? 'release' : 'trial',
picaWechat:window._picaWechat,
status: '',
headerInfo: {
......
<template>
<div class="insurance-sz">
<div class="text">
<img
src="https://files.yunqueyi.com/image/jpeg/common/20230506144713814.jpg"
alt=""
>
</div>
<div class="bottom">
<div
class="bottom-text"
@click="() =>show=true"
>
<div class="bottom-text-left">
选择被保险人
</div>
<div class="bottom-text-right">
<span v-if="person">{{ person }}</span>
<span v-else>请选择</span><van-icon name="arrow" />
</div>
</div>
<div class="bottom-btn">
<van-button
class="btn"
:disabled="!person"
@click="toPage"
>
领取权益
</van-button>
</div>
</div>
<van-popup
v-model="show"
closeable
round
position="bottom"
:style="{ height: '500px' ,overflow:'hidden'}"
>
<div class="popup-title">
选择被保险人
</div>
<div class="popup-list">
<van-radio-group v-model="person">
<van-cell-group>
<van-cell
v-for="(item) in userinfo"
:key="item.id"
clickable
@click="person = item.name"
>
<div class="popup-list-item">
<div class="name">
{{ item.name }}
</div>
<div class="info">
<div class="phoneNum">
<span>手机号码:</span>
<span>{{ item.mobile }}</span>
</div>
<div class="idCard">
<span>身份证号:</span>
<span>{{ item.id_number }}</span>
</div>
</div>
</div>
<template #right-icon>
<van-radio :name="item.name" />
</template>
</van-cell>
</van-cell-group>
</van-radio-group>
</div>
<div class="popup-btn-box">
<van-button
class="popup-btn"
:disabled="!person"
@click="show=false
"
>
确定
</van-button>
</div>
</van-popup>
</div>
</template>
<script>
import axios from 'axios';
export default {
data() {
return {
show: false,
person: null,
env:'test',
userinfo: [
]
};
},
mounted() {
const { env } = this.$route.query;
this.env = env ? env : 'prod';
this.getlist();
},
methods: {
getlist() {
const that = this;
axios.get(`https://project.picahealth.com/batch_get_person_info?num=10&env=${this.env}`).then(function ({data}) {
console.log(data);
if (data.code === '000000') {
that.userinfo = data.data;
}
});
},
toPage() {
const externalOrderNo = Math.floor(new Date().getTime() / 1000);
const projectEquityNo = 'SZ202305031000597601';
console.log(externalOrderNo);
const item = this.userinfo.filter(ele => ele.name === this.person)[0];
localStorage.setItem('chooseInfo', JSON.stringify(item));
this.$router.push({
path: '/appoint-demo',
query: {
externalOrderNo:'SZ' + externalOrderNo,
projectEquityNo
}
});
}
}
};
</script>
<style lang="scss" scoped>
.insurance-sz{
height: 1772px;
display: flex;
justify-content: center;
align-items: center;
padding-bottom: 120px;
.text{
}
.bottom{
position: fixed;
bottom: 0;
width: 100vw;
background: #fff;
padding-bottom: 27px;
.bottom-text{
padding: 10px 21px 10px 15px;
display: flex;
justify-content: space-between;
.bottom-text-left{
height: 18px;
font-size: 13px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #000000;
line-height: 18px;
span{
margin-right: 6px;
}
}
.bottom-text-right{
height: 18px;
font-size: 13px;
font-weight: 600;
line-height: 18px;
font-family: PingFangSC-Regular, PingFang SC;
color: #999999;
}
}
.bottom-btn{
background: #FFFFFF;
box-shadow: inset 0px 1px 0px 0px #E9E9E9;
overflow: hidden;
text-align: center;
.btn{
width: 351px;
height: 40px;
background: #00BDA5;
border-radius: 20px;
margin: 4px auto;
font-size: 16px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 40px;
text-align: center;
}
}
}
}
.van-popup--bottom{
width: 100%;
}
.popup-title{
width: 100%;
position: absolute;
top: 0;
height: 25px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 600;
color: #02120F;
line-height: 25px;
text-align: center;
padding: 17px 0;
}
/deep/ .van-cell{
padding-top:0 ;
padding-bottom: 0;
}
.popup-list{
position: absolute;
width: 100%;
top: 50px;
height: calc(100% - 135px);
overflow: auto;
padding-bottom: 130px;
}
.popup-list-item{
display: flex;
align-items: center;
padding: 23px 0;
.name{
width: 45px;
font-size: 15px;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #212121;
text-align: center;
margin-right: 12px;
}
.info{
.phoneNum{
height: 14px;
font-size:14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 14px;
margin-bottom: 6px;
}
.idCard{
height: 14px;
font-size:14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #666666;
line-height: 14px;
}
}
}
.popup-btn-box{
position: fixed;
z-index: 2;
width: 100%;
bottom: 0;
padding: 20px 0;
background: #FFFFFF;
border: 1px solid #ebedf0;
}
.popup-btn{
margin: 0 auto;
width: 351px;
height: 40px;
background: #00BDA5;
border-radius: 20px;
font-size: 16px;
text-align: center;
font-weight: 600;
color: #FFFFFF;
line-height: 40px;
display: block;
}
/deep/ .van-radio__icon--checked .van-icon{
background: #00bda5;
border-color: #00bda5;
}
</style>
......@@ -35,7 +35,7 @@ module.exports = {
port: 8083,
proxy: {
'/proxy': {
target: 'https://dev-sc.yunqueyi.com/',
target: 'https://test1-sc.yunqueyi.com/',
// target: 'https://test1-sc.yunqueyi.com/',
// target: 'https://uat-sc.yunqueyi.com/',
// http://10.241.65.90:3000/mock/1071/cs/route/removeUser
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册