Skip to content

P
pica-insurance
提交 ab56b07a 编写于 作者: 张磊's avatar 张磊
浏览文件
操作

da ka

上级 b6a02ab3
显示空白字符变更
内嵌 并排
正在显示 包含 53 行增加 和 76 行删除
gitPush.sh
浏览文件 @ ab56b07a
#!/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"`
diff=`git diff $result $originBranch | grep -i ">>>>>>"`
empty=""
if test $diff -eq $empty
then
echo "没有冲突，继续"
current_id=`git log -n 1 $originBranch --pretty=format:"%H"`
git reset --soft $current_id
git add .
git commit -m "$msg"
echo "curBranch $result"
git push -f origin $result # 提交代码到github(修改了远程项目名)
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
src/components/selectTime/index.vue
浏览文件 @ ab56b07a
......@@ -112,9 +112,11 @@ export default {
// 获取机构列表
getScheduling() {
const {projectEquityNo, hospitalId} = this;
if(projectEquityNo && hospitalId) {
getScheduling({ projectEquityNo, hospitalId }).then(res => {
this.timsArray = res.data;
});
}
},
selectItem() {
if (this.selectTimes === '') {
......
src/utils/cookieFun.js 已删除 100644 → 0
浏览文件 @ b6a02ab3
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: '/',
});
};
src/utils/index.js
浏览文件 @ ab56b07a
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(),
......
src/views/home/index.vue
浏览文件 @ ab56b07a
......@@ -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);
}
},
......
src/views/insurance-Detection-detail-demo/index.scss
浏览文件 @ ab56b07a
.insurance-quickDetection-detail {
.insurance-quickDetection-detail-demo {
background-color: #f5f6f8;
padding-top: 10px;
min-height: 100vh;
width: 100%;
position: relative;
......
src/views/insurance-Detection-detail-demo/index.vue
浏览文件 @ ab56b07a
<template>
<div class="insurance-quickDetection-detail">
<div class="insurance-quickDetection-detail-demo">
<page-model
v-if="picaWechat != 'wechat'"
ref="PageModel"
......@@ -177,7 +177,8 @@
class="result-list-tips"
>
<div class="list-tips-item">
1.请将带有阳性检测结果的试剂盒和包装盒上的条码一起拍照上传，确保两个元素在同一张照片里.<span @click="showSample(2)">示例图</span>
1.请将带有阳性检测结果的试剂盒和包装盒上的条码一起拍照上传，确保两个元素在同一张照片里.
<!-- <span @click="showSample(2)">示例图</span>-->
</div>
<div
class="list-tips-item"
......@@ -323,13 +324,9 @@ export default {
this.saveOrder();
},
saveOrder() {
const { yunOrderNo, externalOrderNo} = this.$route.query;
const { yunOrderNo} = this.$route.query;
const data = {};
if (this.result) {
// const data = {
// yunOrderNo,
// resultFlag:this.result
// };
data.yunOrderNo = yunOrderNo;
data.resultFlag = this.result;
} else {
......@@ -343,12 +340,12 @@ export default {
hospitalId: 139136,
idType:1,
hospitalName:'人民医院和平社区健康服务中心',
yunOrderNo:yunOrderNo,
yunOrderNoOne:yunOrderNo,
idCard: item.idCard,
externalOrderNo,
externalOrderNo: 'SZ' + Math.floor(new Date().getTime() / 1000),
projectEquityNo:this.projectEquityNo,
mobilePhone: item.phoneNum,
patientName: item.name
patientName: item.name,
};
createOrder(data).then(res => {
console.log(res);
......
src/views/sz-home/index.vue
浏览文件 @ ab56b07a
......@@ -17,12 +17,13 @@
</div>
</div>
<div class="bottom-btn">
<div
<van-button
class="btn"
:disabled="!person"
@click="toPage"
>
领取权益
</div>
</van-button>
</div>
</div>
<van-popup
......@@ -30,7 +31,7 @@
closeable
round
position="bottom"
:style="{ height: '40%' }"
:style="{ height: '270px' }"
>
<div class="popup-title">
选择被保险人
......@@ -65,13 +66,14 @@
</van-cell-group>
</van-radio-group>
</div>
<div
<van-button
class="popup-btn"
:disabled="!person"
@click="show=false
"
>
领取权益
</div>
</van-button>
</van-popup>
</div>
</template>
......@@ -88,13 +90,13 @@ export default {
id:1,
name: '陈琳',
phoneNum: '15966877677',
idCard:'610321********0429'
idCard:'110101197109017455'
},
{
id:2,
name: '刘鑫琳',
phoneNum: '15966877677',
idCard:'610321********0429'
idCard:'110101197109014051'
},
]
};
......@@ -170,6 +172,7 @@ export default {
background: #FFFFFF;
box-shadow: inset 0px 1px 0px 0px #E9E9E9;
overflow: hidden;
text-align: center;
.btn{
width: 351px;
height: 40px;
......@@ -235,17 +238,17 @@ export default {
}
}
.popup-btn{
margin: 4px auto;
width: 351px;
height: 40px;
background: #00BDA5;
border-radius: 20px;
font-size: 16px;
text-align: center;
font-family: PingFangSC-Semibold, PingFang SC;
font-weight: 600;
color: #FFFFFF;
line-height: 40px;
margin: 0 auto;
display: block;
}
/deep/ .van-radio__icon--checked .van-icon{
background: #00bda5;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或